From 3ae9f9432e0df88db99fc7aaadaea3b35bda1f9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 26 Mar 2016 23:52:42 +0100 Subject: [PATCH] Initial TDE conversion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- ia_ora.spec | 26 +++++----- src/Makefile.am | 2 +- src/kwin/Makefile.am | 19 ------- src/kwin/config/Makefile.am | 14 ----- src/twin/Makefile.am | 19 +++++++ src/twin/config/Makefile.am | 14 +++++ src/{kwin => twin}/config/config.cpp | 18 +++---- src/{kwin => twin}/config/config.h | 10 ++-- src/{kwin => twin}/config/configdialog.ui | 0 src/{kwin => twin}/iaora.cpp | 4 +- src/{kwin => twin}/iaora.desktop | 2 +- src/{kwin => twin}/iaora.h | 0 src/{kwin => twin}/iaorabutton.cpp | 0 src/{kwin => twin}/iaorabutton.h | 0 src/{kwin => twin}/iaoraclient.cpp | 2 +- src/{kwin => twin}/iaoraclient.h | 0 src/{kwin => twin}/misc.cpp | 0 src/{kwin => twin}/misc.h | 0 src/widget/Makefile.am | 2 +- src/widget/ia_ora.cpp | 62 +++++++++++------------ src/widget/ia_ora.h | 6 +-- 21 files changed, 100 insertions(+), 100 deletions(-) delete mode 100644 src/kwin/Makefile.am delete mode 100644 src/kwin/config/Makefile.am create mode 100644 src/twin/Makefile.am create mode 100644 src/twin/config/Makefile.am rename src/{kwin => twin}/config/config.cpp (87%) rename src/{kwin => twin}/config/config.h (88%) rename src/{kwin => twin}/config/configdialog.ui (100%) rename src/{kwin => twin}/iaora.cpp (99%) rename src/{kwin => twin}/iaora.desktop (65%) rename src/{kwin => twin}/iaora.h (100%) rename src/{kwin => twin}/iaorabutton.cpp (100%) rename src/{kwin => twin}/iaorabutton.h (100%) rename src/{kwin => twin}/iaoraclient.cpp (99%) rename src/{kwin => twin}/iaoraclient.h (100%) rename src/{kwin => twin}/misc.cpp (100%) rename src/{kwin => twin}/misc.h (100%) diff --git a/ia_ora.spec b/ia_ora.spec index 315e7fc..e1d8801 100644 --- a/ia_ora.spec +++ b/ia_ora.spec @@ -5,8 +5,8 @@ Release: %mkrel 2 License: GPL Group: Graphical desktop/Other URL: http://www.mandrivalinux.com/ -BuildRequires: kdelibs-devel -BuildRequires: kdebase-devel >= 3.1.94-11mdk +BuildRequires: tdelibs-devel +BuildRequires: tdebase-devel >= 3.1.94-11mdk Source0: %{name}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot @@ -21,11 +21,11 @@ Group: Graphical desktop/KDE %description kde Mandriva theme for KDE - Widget design -%package kde-kwin +%package kde-twin Summary: Mandriva theme for KDE - Window Decorations Group: Graphical desktop/KDE -%description kde-kwin +%description kde-twin Mandriva theme for KDE - Window Decorations @@ -36,10 +36,10 @@ Mandriva theme for KDE - Window Decorations make -f admin/Makefile.common cvs export QTDIR=%qtdir -export KDEDIR=%_prefix +export TDEDIR=%_prefix -export LD_LIBRARY_PATH=$QTDIR/%_lib:$KDEDIR/%_lib:$LD_LIBRARY_PATH -export PATH=$QTDIR/bin:$KDEDIR/bin:$PATH +export LD_LIBRARY_PATH=$QTDIR/%_lib:$TDEDIR/%_lib:$LD_LIBRARY_PATH +export PATH=$QTDIR/bin:$TDEDIR/bin:$PATH %configure2_5x \ %if "%{_lib}" != "lib" @@ -57,13 +57,13 @@ rm -rf $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT -%files kde-kwin +%files kde-twin %defattr(-,root,root,-) -%_libdir/kde3/kwin3_iaora.la -%_libdir/kde3/kwin3_iaora.so -%_libdir/kde3/kwin_iaora_config.la -%_libdir/kde3/kwin_iaora_config.so -%_datadir/apps/kwin/iaora.desktop +%_libdir/kde3/twin3_iaora.la +%_libdir/kde3/twin3_iaora.so +%_libdir/kde3/twin_iaora_config.la +%_libdir/kde3/twin_iaora_config.so +%_datadir/apps/twin/iaora.desktop diff --git a/src/Makefile.am b/src/Makefile.am index cc6a276..2bcf4d9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1 +1 @@ -SUBDIRS=widget kwin +SUBDIRS=widget twin diff --git a/src/kwin/Makefile.am b/src/kwin/Makefile.am deleted file mode 100644 index 89c4748..0000000 --- a/src/kwin/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -AUTOMAKE_OPTIONS = foreign - -SUBDIRS = config - -KDE_CXXFLAGS = -DQT_PLUGIN - -INCLUDES = -I$(srcdir)/../../lib $(all_includes) - -kwindir = $(kde_datadir)/kwin/ -kwin_DATA = iaora.desktop - -kde_module_LTLIBRARIES = kwin3_iaora.la -kwin3_iaora_la_SOURCES = iaora.cpp iaoraclient.cpp iaorabutton.cpp misc.cpp -kwin3_iaora_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin3_iaora_la_LIBADD = $(LIB_KDEUI) -lkdecorations $(LIB_QT) $(LIB_KDECORE) -lkdefx -kwin3_iaora_la_METASOURCES = AUTO - -DISTCLEANFILES = $(kwin3_iaora_la_METASOURCES) - diff --git a/src/kwin/config/Makefile.am b/src/kwin/config/Makefile.am deleted file mode 100644 index 4cf8d6d..0000000 --- a/src/kwin/config/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -INCLUDES = $(all_includes) - -kde_module_LTLIBRARIES = kwin_iaora_config.la - -kwin_iaora_config_la_SOURCES = config.cpp configdialog.ui -kwin_iaora_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin_iaora_config_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) - -METASOURCES = AUTO -noinst_HEADERS = config.h -DISTCLEANFILES = $(METASOURCES) - -lnkdir = $(kde_datadir)/kwin - diff --git a/src/twin/Makefile.am b/src/twin/Makefile.am new file mode 100644 index 0000000..3472d4c --- /dev/null +++ b/src/twin/Makefile.am @@ -0,0 +1,19 @@ +AUTOMAKE_OPTIONS = foreign + +SUBDIRS = config + +KDE_CXXFLAGS = -DQT_PLUGIN + +INCLUDES = -I$(srcdir)/../../lib $(all_includes) + +twindir = $(kde_datadir)/twin/ +twin_DATA = iaora.desktop + +kde_module_LTLIBRARIES = twin3_iaora.la +twin3_iaora_la_SOURCES = iaora.cpp iaoraclient.cpp iaorabutton.cpp misc.cpp +twin3_iaora_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin3_iaora_la_LIBADD = $(LIB_TDEUI) -ltdecorations $(LIB_QT) $(LIB_TDECORE) -ltdefx +twin3_iaora_la_METASOURCES = AUTO + +DISTCLEANFILES = $(twin3_iaora_la_METASOURCES) + diff --git a/src/twin/config/Makefile.am b/src/twin/config/Makefile.am new file mode 100644 index 0000000..82a856e --- /dev/null +++ b/src/twin/config/Makefile.am @@ -0,0 +1,14 @@ +INCLUDES = $(all_includes) + +kde_module_LTLIBRARIES = twin_iaora_config.la + +twin_iaora_config_la_SOURCES = config.cpp configdialog.ui +twin_iaora_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_iaora_config_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) + +METASOURCES = AUTO +noinst_HEADERS = config.h +DISTCLEANFILES = $(METASOURCES) + +lnkdir = $(kde_datadir)/twin + diff --git a/src/kwin/config/config.cpp b/src/twin/config/config.cpp similarity index 87% rename from src/kwin/config/config.cpp rename to src/twin/config/config.cpp index 7b0fdd9..1410345 100644 --- a/src/kwin/config/config.cpp +++ b/src/twin/config/config.cpp @@ -29,19 +29,19 @@ #include #include -#include -#include -#include +#include +#include +#include #include "config.h" #include "configdialog.h" -IaOraConfig::IaOraConfig(KConfig* config, TQWidget* parent) +IaOraConfig::IaOraConfig(TDEConfig* config, TQWidget* parent) : TQObject(parent), m_config(0), m_dialog(0) { // create the configuration object - m_config = new KConfig("kwiniaorarc"); - KGlobal::locale()->insertCatalogue("kwin_clients"); + m_config = new TDEConfig("twiniaorarc"); + TDEGlobal::locale()->insertCatalogue("twin_clients"); // create and show the configuration dialog m_dialog = new ConfigDialog(parent); @@ -63,7 +63,7 @@ IaOraConfig::~IaOraConfig() delete m_config; } -void IaOraConfig::load(KConfig*) +void IaOraConfig::load(TDEConfig*) { m_config->setGroup("General"); @@ -73,7 +73,7 @@ void IaOraConfig::load(KConfig*) m_dialog->titleShadow->setChecked(titleShadow); } -void IaOraConfig::save(KConfig*) +void IaOraConfig::save(TDEConfig*) { m_config->setGroup("General"); @@ -94,7 +94,7 @@ void IaOraConfig::defaults() extern "C" { - KDE_EXPORT TQObject* allocate_config(KConfig* config, TQWidget* parent) { + KDE_EXPORT TQObject* allocate_config(TDEConfig* config, TQWidget* parent) { return (new IaOraConfig(config, parent)); } } diff --git a/src/kwin/config/config.h b/src/twin/config/config.h similarity index 88% rename from src/kwin/config/config.h rename to src/twin/config/config.h index 513b83c..531c73b 100644 --- a/src/kwin/config/config.h +++ b/src/twin/config/config.h @@ -29,26 +29,26 @@ class TQButtonGroup; class TQGroupBox; -class KConfig; +class TDEConfig; class ConfigDialog; class IaOraConfig : public TQObject { Q_OBJECT public: - IaOraConfig(KConfig* config, TQWidget* parent); + IaOraConfig(TDEConfig* config, TQWidget* parent); ~IaOraConfig(); signals: void changed(); public slots: - void load(KConfig *config); - void save(KConfig *config); + void load(TDEConfig *config); + void save(TDEConfig *config); void defaults(); private: - KConfig *m_config; + TDEConfig *m_config; ConfigDialog *m_dialog; }; diff --git a/src/kwin/config/configdialog.ui b/src/twin/config/configdialog.ui similarity index 100% rename from src/kwin/config/configdialog.ui rename to src/twin/config/configdialog.ui diff --git a/src/kwin/iaora.cpp b/src/twin/iaora.cpp similarity index 99% rename from src/kwin/iaora.cpp rename to src/twin/iaora.cpp index d827141..a588888 100644 --- a/src/kwin/iaora.cpp +++ b/src/twin/iaora.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include @@ -140,7 +140,7 @@ bool IaOraHandler::supports( Ability ability ) void IaOraHandler::readConfig() { // create a config object - KConfig config("kwiniaorarc"); + TDEConfig config("twiniaorarc"); config.setGroup("General"); // grab settings diff --git a/src/kwin/iaora.desktop b/src/twin/iaora.desktop similarity index 65% rename from src/kwin/iaora.desktop rename to src/twin/iaora.desktop index 7bece01..3283e19 100644 --- a/src/kwin/iaora.desktop +++ b/src/twin/iaora.desktop @@ -2,4 +2,4 @@ Encoding=UTF-8 Icon= Name=Ia ora -X-KDE-Library=kwin3_iaora +X-TDE-Library=twin3_iaora diff --git a/src/kwin/iaora.h b/src/twin/iaora.h similarity index 100% rename from src/kwin/iaora.h rename to src/twin/iaora.h diff --git a/src/kwin/iaorabutton.cpp b/src/twin/iaorabutton.cpp similarity index 100% rename from src/kwin/iaorabutton.cpp rename to src/twin/iaorabutton.cpp diff --git a/src/kwin/iaorabutton.h b/src/twin/iaorabutton.h similarity index 100% rename from src/kwin/iaorabutton.h rename to src/twin/iaorabutton.h diff --git a/src/kwin/iaoraclient.cpp b/src/twin/iaoraclient.cpp similarity index 99% rename from src/kwin/iaoraclient.cpp rename to src/twin/iaoraclient.cpp index 73f523f..d2cc500 100644 --- a/src/kwin/iaoraclient.cpp +++ b/src/twin/iaoraclient.cpp @@ -22,7 +22,7 @@ Boston, MA 02110-1301, USA. */ -#include +#include #include #include diff --git a/src/kwin/iaoraclient.h b/src/twin/iaoraclient.h similarity index 100% rename from src/kwin/iaoraclient.h rename to src/twin/iaoraclient.h diff --git a/src/kwin/misc.cpp b/src/twin/misc.cpp similarity index 100% rename from src/kwin/misc.cpp rename to src/twin/misc.cpp diff --git a/src/kwin/misc.h b/src/twin/misc.h similarity index 100% rename from src/kwin/misc.h rename to src/twin/misc.h diff --git a/src/widget/Makefile.am b/src/widget/Makefile.am index 5609a26..ca6c057 100644 --- a/src/widget/Makefile.am +++ b/src/widget/Makefile.am @@ -6,7 +6,7 @@ INCLUDES = $(all_includes) noinst_HEADERS = ia_ora.h bitmaps.h kde_style_LTLIBRARIES = ia_ora.la ia_ora_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -ia_ora_la_LIBADD = -lkdefx $(LIB_KDECORE) $(LIB_QT) +ia_ora_la_LIBADD = -ltdefx $(LIB_TDECORE) $(LIB_QT) ia_ora_la_SOURCES = ia_ora.cpp ia_ora_la_METASOURCES = AUTO diff --git a/src/widget/ia_ora.cpp b/src/widget/ia_ora.cpp index 0e3e5d2..3cc1b09 100644 --- a/src/widget/ia_ora.cpp +++ b/src/widget/ia_ora.cpp @@ -96,7 +96,7 @@ static const int itemHMargin = 3; static const int itemVMargin = 0; static const int arrowHMargin = 6; static const int rightBorder = 12; -static const char* kdeToolbarWidget = "kde toolbar widget"; +static const char* kdeToolbarWidget = "tde toolbar widget"; const int smallButMaxW = 27; const int smallButMaxH = 20; @@ -108,7 +108,7 @@ MandrivaStyle::MandrivaColorData::~MandrivaColorData() // --------------------------------------------------------------------------- MandrivaStyle::MandrivaStyle( ) - : KStyle( AllowMenuTransparency | FilledFrameWorkaround, WindowsStyleScrollBar ) + : TDEStyle( AllowMenuTransparency | FilledFrameWorkaround, WindowsStyleScrollBar ) , m_dataCache (), formMode( false ),kickerMode(false) { hoverWidget = 0L; @@ -381,7 +381,7 @@ void MandrivaStyle::polish(TQWidget* widget) widget->installEventFilter(this); widget->setBackgroundMode( TQWidget::PaletteBackground ); } - else if ( widget->inherits( "KToolBarSeparator" ) || widget->inherits( "TQToolBarSeparator" ) ) + else if ( widget->inherits( "TDEToolBarSeparator" ) || widget->inherits( "TQToolBarSeparator" ) ) { widget->setBackgroundMode( TQWidget::PaletteBackground ); } @@ -391,7 +391,7 @@ void MandrivaStyle::polish(TQWidget* widget) } else if ( widget->parentWidget() && ( ( widget->inherits( "TQListBox" ) && widget->parentWidget()->inherits( "TQComboBox" ) ) - || widget->inherits( "KCompletionBox" ) ) ) + || widget->inherits( "TDECompletionBox" ) ) ) { TQListBox* listbox = (TQListBox*) widget; listbox->setLineWidth( 1 ); @@ -403,7 +403,7 @@ void MandrivaStyle::polish(TQWidget* widget) widget->setBackgroundMode( NoBackground ); // We paint the whole background. widget->installEventFilter(this); } - KStyle::polish( widget ); + TDEStyle::polish( widget ); } @@ -436,7 +436,7 @@ void MandrivaStyle::unPolish(TQWidget* widget) } else if ( widget->parentWidget() && ( ( widget->inherits( "TQListBox" ) && widget->parentWidget()->inherits( "TQComboBox" ) ) - || widget->inherits( "KCompletionBox" ) ) ) + || widget->inherits( "TDECompletionBox" ) ) ) { TQListBox* listbox = (TQListBox*) widget; listbox->setLineWidth( 1 ); @@ -445,7 +445,7 @@ void MandrivaStyle::unPolish(TQWidget* widget) widget->clearMask(); } //For toolbar internal separators, return to button, too (can't use tqt_cast here since don't have access to the class) - else if ( widget->inherits( "KToolBarSeparator" ) || widget->inherits( "TQToolBarSeparator" ) ) + else if ( widget->inherits( "TDEToolBarSeparator" ) || widget->inherits( "TQToolBarSeparator" ) ) { widget->setBackgroundMode( TQWidget::PaletteBackground ); } @@ -455,7 +455,7 @@ void MandrivaStyle::unPolish(TQWidget* widget) widget->removeEventFilter(this); } - KStyle::unPolish( widget ); + TDEStyle::unPolish( widget ); } /* reimp. */ @@ -798,7 +798,7 @@ void MandrivaStyle::drawPrimitive( PrimitiveElement pe, p->setPen(oldPen); } else - KStyle::drawPrimitive(pe, p, r, cg, flags, opt); + TDEStyle::drawPrimitive(pe, p, r, cg, flags, opt); break; } case PE_GroupBoxFrame: @@ -1371,7 +1371,7 @@ void MandrivaStyle::drawPrimitive( PrimitiveElement pe, drawMandrivaArrow( a, p, r, cg, flags, opt ); } else - KStyle::drawPrimitive( pe, p, r, cg, flags, opt ); + TDEStyle::drawPrimitive( pe, p, r, cg, flags, opt ); } } //switch } @@ -1389,7 +1389,7 @@ void MandrivaStyle::drawMandrivaArrow( TQPointArray a, TQPainter *p, p->setPen( oldPen ); // restore pen } -void MandrivaStyle::drawKStylePrimitive( KStylePrimitive pe, +void MandrivaStyle::drawTDEStylePrimitive( TDEStylePrimitive pe, TQPainter* p, const TQWidget* widget, const TQRect &r, @@ -1514,7 +1514,7 @@ void MandrivaStyle::drawKStylePrimitive( KStylePrimitive pe, } break; } - // copied and slightly modified from KStyle. + // copied and slightly modified from TDEStyle. case KPE_ListViewBranch: { // Typical Windows style listview branch element (dotted line). @@ -1589,7 +1589,7 @@ void MandrivaStyle::drawKStylePrimitive( KStylePrimitive pe, break; } default: - KStyle::drawKStylePrimitive( pe, p, widget, r, cg, flags, opt); + TDEStyle::drawTDEStylePrimitive( pe, p, widget, r, cg, flags, opt); } } @@ -1795,7 +1795,7 @@ void MandrivaStyle::drawControl( ControlElement element, } case CE_ToolButtonLabel: { - KStyle::drawControl(element, p, widget, r, cg, flags, opt); + TDEStyle::drawControl(element, p, widget, r, cg, flags, opt); break; } @@ -2307,7 +2307,7 @@ void MandrivaStyle::drawControl( ControlElement element, } break; default: - KStyle::drawControl(element, p, widget, r, cg, flags, opt); + TDEStyle::drawControl(element, p, widget, r, cg, flags, opt); } } @@ -2326,7 +2326,7 @@ void MandrivaStyle::drawControlMask( ControlElement element, break; } default: - KStyle::drawControlMask(element, p, widget, r, opt); + TDEStyle::drawControlMask(element, p, widget, r, opt); } } @@ -2683,7 +2683,7 @@ void MandrivaStyle::drawComplexControl( ComplexControl control, break; } default: - KStyle::drawComplexControl(control, p, widget, + TDEStyle::drawComplexControl(control, p, widget, r, cg, flags, controls, active, opt); } } @@ -2702,7 +2702,7 @@ TQRect MandrivaStyle::querySubControlMetrics( ComplexControl control, case SC_SpinWidgetButtonField: return TQRect( widget->width() -14 , 0, 14, widget->height() ); default: - return KStyle::querySubControlMetrics( control, widget, subcontrol, opt ); + return TDEStyle::querySubControlMetrics( control, widget, subcontrol, opt ); } } //TODO verify it. @@ -2729,7 +2729,7 @@ TQRect MandrivaStyle::querySubControlMetrics( ComplexControl control, return TQRect( 5, 1, widget->width() - arrow-12, widget->height() - 2); } default: - return KStyle::querySubControlMetrics( control, widget, subcontrol, opt ); + return TDEStyle::querySubControlMetrics( control, widget, subcontrol, opt ); } break; } @@ -2768,7 +2768,7 @@ TQRect MandrivaStyle::querySubControlMetrics( ComplexControl control, default: break; } - return KStyle::querySubControlMetrics( control, widget, subcontrol, opt ); + return TDEStyle::querySubControlMetrics( control, widget, subcontrol, opt ); } void MandrivaStyle::drawComplexControlMask( ComplexControl control, @@ -2796,10 +2796,10 @@ void MandrivaStyle::drawComplexControlMask( ComplexControl control, } default: - KStyle::drawComplexControlMask(control, p, widget, r, opt); + TDEStyle::drawComplexControlMask(control, p, widget, r, opt); } //#endif - //KStyle::drawComplexControlMask(control, p, widget, r, opt); + //TDEStyle::drawComplexControlMask(control, p, widget, r, opt); } @@ -2841,7 +2841,7 @@ int MandrivaStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const case PM_TabBarTabShiftVertical: return 0; default: - return KStyle::pixelMetric(m, widget); + return TDEStyle::pixelMetric(m, widget); } } @@ -2876,7 +2876,7 @@ TQSize MandrivaStyle::sizeFromContents( ContentsType contents, } else { - return KStyle::sizeFromContents( contents, widget, contentSize, opt ); + return TDEStyle::sizeFromContents( contents, widget, contentSize, opt ); } } case CT_ComboBox: @@ -2981,7 +2981,7 @@ TQSize MandrivaStyle::sizeFromContents( ContentsType contents, } default: - return KStyle::sizeFromContents( contents, widget, contentSize, opt ); + return TDEStyle::sizeFromContents( contents, widget, contentSize, opt ); } } @@ -2991,12 +2991,12 @@ TQPixmap MandrivaStyle::stylePixmap(StylePixmap stylepixmap, const TQWidget* widget, const TQStyleOption& opt) const { - return KStyle::stylePixmap(stylepixmap, widget, opt); + return TDEStyle::stylePixmap(stylepixmap, widget, opt); } bool MandrivaStyle::eventFilter( TQObject *object, TQEvent *event ) { - if (KStyle::eventFilter( object, event )) + if (TDEStyle::eventFilter( object, event )) return true; TQToolBar* toolbar; //Hover highlight on buttons and combos @@ -3043,7 +3043,7 @@ bool MandrivaStyle::eventFilter( TQObject *object, TQEvent *event ) else if ( object->parent() && !qstrcmp( object->name(), kdeToolbarWidget ) ) { // Draw a gradient background for custom widgets in the toolbar - // that have specified a "kde toolbar widget" name. + // that have specified a "tde toolbar widget" name. if (event->type() == TQEvent::Paint ) { @@ -3356,7 +3356,7 @@ TQRect MandrivaStyle::subRect(SubRect r, const TQWidget *widget) const return querySubControlMetrics( CC_ComboBox, widget, SC_ComboBoxEditField ); } default: - return KStyle::subRect( r, widget ); + return TDEStyle::subRect( r, widget ); } } @@ -3403,7 +3403,7 @@ bool MandrivaStyle::excludeColor(const TQColor &col, bool active) const bool MandrivaStyle::isFormWidget(const TQWidget* widget) const { - //Form widgets are in the KHTMLView, but that has 2 further inner levels + //Form widgets are in the TDEHTMLView, but that has 2 further inner levels //of widgets - TQClipperWidget, and outside of that, TQViewportWidget TQWidget* potentialClipPort = widget->parentWidget(); if ( !potentialClipPort || potentialClipPort->isTopLevel() ) @@ -3416,7 +3416,7 @@ bool MandrivaStyle::isFormWidget(const TQWidget* widget) const TQWidget* potentialKHTML = potentialViewPort->parentWidget(); if (!potentialKHTML || potentialKHTML->isTopLevel() || - qstrcmp(potentialKHTML->className(), "KHTMLView") ) + qstrcmp(potentialKHTML->className(), "TDEHTMLView") ) return false; diff --git a/src/widget/ia_ora.h b/src/widget/ia_ora.h index 2c9c174..aaac040 100644 --- a/src/widget/ia_ora.h +++ b/src/widget/ia_ora.h @@ -37,13 +37,13 @@ #include #include #include -#include +#include #include class TQPopupMenu; -class MandrivaStyle : public KStyle +class MandrivaStyle : public TDEStyle { Q_OBJECT @@ -57,7 +57,7 @@ public: void renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup &cg, const TQPopupMenu* popup ) const; - void drawKStylePrimitive( KStylePrimitive kpe, + void drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p, const TQWidget* widget, const TQRect &r,