Revert style and class names to QtCurve

Fix FTBFS on Qt3

4 files changed, 66 insertions, 66 deletions

diff --git a/config/exportthemedialog.cpp b/config/exportthemedialog.cpp
index 1c683bb..8496654 100644
--- a/config/exportthemedialog.cpp
+++ b/config/exportthemedialog.cpp
@@ -1,5 +1,5 @@
 /*
-  TQtCurve (C) Craig Drummond, 2003 - 2010 craig.p.drummond@gmail.com
+  QtCurve (C) Craig Drummond, 2003 - 2010 craig.p.drummond@gmail.com
 
   ----
 
diff --git a/config/qtcurveconfig.cpp b/config/qtcurveconfig.cpp
index e9a950f..ef2ec4c 100644
--- a/config/qtcurveconfig.cpp
+++ b/config/qtcurveconfig.cpp
@@ -1,5 +1,5 @@
 /*
-  TQtCurve (C) Craig Drummond, 2003 - 2010 craig.p.drummond@gmail.com
+  QtCurve (C) Craig Drummond, 2003 - 2010 craig.p.drummond@gmail.com
 
   ----
 
@@ -65,7 +65,7 @@ extern "C"
     TQWidget * allocate_kstyle_config(TQWidget *parent)
     {
         KGlobal::locale()->insertCatalogue("qtcurve");
-        return new TQtCurveConfig(parent);
+        return new QtCurveConfig(parent);
     }
 }
 
@@ -260,7 +260,7 @@ class CGradItem : public TQListViewItem
     double prev;
 };
 
-CGradientPreview::CGradientPreview(TQtCurveConfig *c, TQWidget *p)
+CGradientPreview::CGradientPreview(QtCurveConfig *c, TQWidget *p)
                 : TQWidget(p),
                   cfg(c)
 {
@@ -561,8 +561,8 @@ static void insertLvLinesEntries(TQComboBox *combo)
     combo->insertItem(i18n("Old style (TDE and Gtk2 different)"));
 }
 
-TQtCurveConfig::TQtCurveConfig(TQWidget *parent)
-             : TQtCurveConfigBase(parent),
+QtCurveConfig::QtCurveConfig(TQWidget *parent)
+             : QtCurveConfigBase(parent),
 #ifdef TQTC_STYLE_SUPPORT
                exportDialog(NULL),
 #endif
@@ -793,11 +793,11 @@ TQtCurveConfig::TQtCurveConfig(TQWidget *parent)
     resize(600, 400);
 }
 
-TQtCurveConfig::~TQtCurveConfig()
+QtCurveConfig::~QtCurveConfig()
 {
 }
 
-void TQtCurveConfig::loadStyles(TQPopupMenu *menu)
+void QtCurveConfig::loadStyles(TQPopupMenu *menu)
 {
     TQStringList  files(KGlobal::dirs()->findAllResources("data", "QtCurve/*"EXTENSION, false, true));
 
@@ -813,7 +813,7 @@ void TQtCurveConfig::loadStyles(TQPopupMenu *menu)
                                     this, SLOT(setStyle(int)))]=*it;
 }
 
-void TQtCurveConfig::save()
+void QtCurveConfig::save()
 {
     Options opts=currentStyle;
 
@@ -836,26 +836,26 @@ void TQtCurveConfig::save()
     cfg->setForceGlobal(useGlobals);
 }
 
-void TQtCurveConfig::defaults()
+void QtCurveConfig::defaults()
 {
     setWidgetOptions(defaultStyle);
     if (settingsChanged())
         emit changed(true);
 }
 
-void TQtCurveConfig::setStyle(int s)
+void QtCurveConfig::setStyle(int s)
 {
     loadStyle(styles[s]);
 }
 
-void TQtCurveConfig::emboldenToggled()
+void QtCurveConfig::emboldenToggled()
 {
     if(!embolden->isChecked() && IND_NONE==defBtnIndicator->currentItem())
         defBtnIndicator->setCurrentItem(IND_TINT);
     updateChanged();
 }
 
-void TQtCurveConfig::defBtnIndicatorChanged()
+void QtCurveConfig::defBtnIndicatorChanged()
 {
     if(IND_NONE==defBtnIndicator->currentItem() && !embolden->isChecked())
         embolden->setChecked(true);
@@ -868,7 +868,7 @@ void TQtCurveConfig::defBtnIndicatorChanged()
     updateChanged();
 }
 
-void TQtCurveConfig::buttonEffectChanged()
+void QtCurveConfig::buttonEffectChanged()
 {
     if(EFFECT_NONE==buttonEffect->currentItem())
     {
@@ -881,7 +881,7 @@ void TQtCurveConfig::buttonEffectChanged()
     updateChanged();
 }
 
-void TQtCurveConfig::coloredMouseOverChanged()
+void QtCurveConfig::coloredMouseOverChanged()
 {
     if(MO_GLOW==coloredMouseOver->currentItem() &&
        EFFECT_NONE==buttonEffect->currentItem())
@@ -890,51 +890,51 @@ void TQtCurveConfig::coloredMouseOverChanged()
     updateChanged();
 }
 
-void TQtCurveConfig::shadeSlidersChanged()
+void QtCurveConfig::shadeSlidersChanged()
 {
     customSlidersColor->setEnabled(SHADE_CUSTOM==shadeSliders->currentItem());
     updateChanged();
 }
 
-void TQtCurveConfig::shadeMenubarsChanged()
+void QtCurveConfig::shadeMenubarsChanged()
 {
     customMenubarsColor->setEnabled(SHADE_CUSTOM==shadeMenubars->currentItem());
     updateChanged();
 }
 
-void TQtCurveConfig::shadeCheckRadioChanged()
+void QtCurveConfig::shadeCheckRadioChanged()
 {
     customCheckRadioColor->setEnabled(SHADE_CUSTOM==shadeCheckRadio->currentItem());
     updateChanged();
 }
 
-void TQtCurveConfig::customMenuTextColorChanged()
+void QtCurveConfig::customMenuTextColorChanged()
 {
     customMenuNormTextColor->setEnabled(customMenuTextColor->isChecked());
     customMenuSelTextColor->setEnabled(customMenuTextColor->isChecked());
     updateChanged();
 }
 
-void TQtCurveConfig::menuStripeChanged()
+void QtCurveConfig::menuStripeChanged()
 {
     customMenuStripeColor->setEnabled(SHADE_CUSTOM==menuStripe->currentItem());
     menuStripeAppearance->setEnabled(SHADE_NONE!=menuStripe->currentItem());
     updateChanged();
 }
 
-void TQtCurveConfig::comboBtnChanged()
+void QtCurveConfig::comboBtnChanged()
 {
     customComboBtnColor->setEnabled(SHADE_CUSTOM==comboBtn->currentItem());
     updateChanged();
 }
 
-void TQtCurveConfig::sortedLvChanged()
+void QtCurveConfig::sortedLvChanged()
 {
     customSortedLvColor->setEnabled(SHADE_CUSTOM==sortedLv->currentItem());
     updateChanged();
 }
 
-void TQtCurveConfig::stripedProgressChanged()
+void QtCurveConfig::stripedProgressChanged()
 {
     bool allowAnimation=STRIPE_NONE!=stripedProgress->currentItem() &&
                         STRIPE_FADE!=stripedProgress->currentItem();
@@ -945,7 +945,7 @@ void TQtCurveConfig::stripedProgressChanged()
     updateChanged();
 }
 
-void TQtCurveConfig::activeTabAppearanceChanged()
+void QtCurveConfig::activeTabAppearanceChanged()
 {
     int  current(activeTabAppearance->currentItem());
     bool disableCol(APPEARANCE_FLAT==current && APPEARANCE_RAISED==current);
@@ -956,7 +956,7 @@ void TQtCurveConfig::activeTabAppearanceChanged()
     updateChanged();
 }
 
-void TQtCurveConfig::tabMoChanged()
+void QtCurveConfig::tabMoChanged()
 {
     if(TAB_MO_GLOW==tabMouseOver->currentItem())
         roundAllTabs->setChecked(true);
@@ -964,14 +964,14 @@ void TQtCurveConfig::tabMoChanged()
     updateChanged();
 }
 
-void TQtCurveConfig::shadingChanged()
+void QtCurveConfig::shadingChanged()
 {
     updateChanged();
     if(gradPreview)
         gradPreview->repaint();
 }
 
-void TQtCurveConfig::passwordCharClicked()
+void QtCurveConfig::passwordCharClicked()
 {
     int              cur(toInt(passwordChar->text()));
     CharSelectDialog dlg(this, cur);
@@ -983,7 +983,7 @@ void TQtCurveConfig::passwordCharClicked()
     }
 }
 
-void TQtCurveConfig::unifySpinBtnsToggled()
+void QtCurveConfig::unifySpinBtnsToggled()
 {
     if(unifySpinBtns->isChecked())
         unifySpin->setChecked(false);
@@ -991,7 +991,7 @@ void TQtCurveConfig::unifySpinBtnsToggled()
     updateChanged();
 }
 
-void TQtCurveConfig::unifySpinToggled()
+void QtCurveConfig::unifySpinToggled()
 {
     if(unifySpin->isChecked())
         unifySpinBtns->setChecked(false);
@@ -999,14 +999,14 @@ void TQtCurveConfig::unifySpinToggled()
     updateChanged();
 }
 
-void TQtCurveConfig::sliderThumbChanged()
+void QtCurveConfig::sliderThumbChanged()
 {
     if(LINE_NONE!=sliderThumbs->currentItem() && sliderWidth->value()<DEFAULT_SLIDER_WIDTH)
         sliderWidth->setValue(DEFAULT_SLIDER_WIDTH);
     updateChanged();
 }
 
-void TQtCurveConfig::sliderWidthChanged()
+void QtCurveConfig::sliderWidthChanged()
 {
     if(0==sliderWidth->value()%2)
         sliderWidth->setValue(sliderWidth->value()+1);
@@ -1016,7 +1016,7 @@ void TQtCurveConfig::sliderWidthChanged()
     updateChanged();
 }
 
-void TQtCurveConfig::setupStack()
+void QtCurveConfig::setupStack()
 {
     int i=0;
     lastCategory=new CStackItem(stackList, i18n("General"), i++);
@@ -1044,7 +1044,7 @@ void TQtCurveConfig::setupStack()
     connect(stackList, SIGNAL(selectionChanged()), SLOT(changeStack()));
 }
 
-void TQtCurveConfig::changeStack()
+void QtCurveConfig::changeStack()
 {
     CStackItem *item=(CStackItem *)(stackList->selectedItem());
 
@@ -1064,7 +1064,7 @@ void TQtCurveConfig::changeStack()
         stack->raiseWidget(item->stack());
 }
 
-void TQtCurveConfig::gradChanged(int i)
+void QtCurveConfig::gradChanged(int i)
 {
     GradientCont::const_iterator it(customGradient.find((EAppearance)i));
 
@@ -1091,7 +1091,7 @@ void TQtCurveConfig::gradChanged(int i)
     gradBorder->setEnabled(NUM_CUSTOM_GRAD!=i);
 }
 
-void TQtCurveConfig::itemChanged(TQListViewItem *i, int col)
+void QtCurveConfig::itemChanged(TQListViewItem *i, int col)
 {
     GradientCont::iterator it=customGradient.find((EAppearance)gradCombo->currentItem());
 
@@ -1116,7 +1116,7 @@ void TQtCurveConfig::itemChanged(TQListViewItem *i, int col)
     }
 }
 
-void TQtCurveConfig::addGradStop()
+void QtCurveConfig::addGradStop()
 {
     GradientCont::iterator cg=customGradient.find((EAppearance)gradCombo->currentItem());
 
@@ -1168,7 +1168,7 @@ void TQtCurveConfig::addGradStop()
     }
 }
 
-void TQtCurveConfig::removeGradStop()
+void QtCurveConfig::removeGradStop()
 {
     TQListViewItem *cur=gradStops->selectedItem();
 
@@ -1197,7 +1197,7 @@ void TQtCurveConfig::removeGradStop()
     }
 }
 
-void TQtCurveConfig::updateGradStop()
+void QtCurveConfig::updateGradStop()
 {
     TQListViewItem *i=gradStops->selectedItem();
 
@@ -1225,7 +1225,7 @@ void TQtCurveConfig::updateGradStop()
         addGradStop();
 }
 
-void TQtCurveConfig::stopSelected()
+void QtCurveConfig::stopSelected()
 {
     TQListViewItem *i=gradStops->selectedItem();
 
@@ -1244,7 +1244,7 @@ void TQtCurveConfig::stopSelected()
     }
 }
 
-void TQtCurveConfig::setupGradientsTab()
+void QtCurveConfig::setupGradientsTab()
 {
     for(int i=APPEARANCE_CUSTOM1; i<(APPEARANCE_CUSTOM1+NUM_CUSTOM_GRAD); ++i)
         gradCombo->insertItem(i18n("Custom gradient %1").arg((i-APPEARANCE_CUSTOM1)+1));
@@ -1281,7 +1281,7 @@ void TQtCurveConfig::setupGradientsTab()
     connect(gradStops, SIGNAL(selectionChanged()), SLOT(stopSelected()));
 }
 
-void TQtCurveConfig::setupShadesTab()
+void QtCurveConfig::setupShadesTab()
 {
     int shade(0);
 
@@ -1294,14 +1294,14 @@ void TQtCurveConfig::setupShadesTab()
     connect(customShading, SIGNAL(toggled(bool)), SLOT(updateChanged()));
 }
 
-void TQtCurveConfig::setupShade(KDoubleNumInput *w, int shade)
+void QtCurveConfig::setupShade(KDoubleNumInput *w, int shade)
 {
     w->setRange(0.0, 2.0, 0.05, false);
     connect(w, SIGNAL(valueChanged(double)), SLOT(updateChanged()));
     shadeVals[shade]=w;
 }
 
-void TQtCurveConfig::populateShades(const Options &opts)
+void QtCurveConfig::populateShades(const Options &opts)
 {
     SHADES
     int contrast=TQSettings().readNumEntry("/Qt/KDE/contrast", 7);
@@ -1320,7 +1320,7 @@ void TQtCurveConfig::populateShades(const Options &opts)
                                           [i]);
 }
 
-bool TQtCurveConfig::diffShades(const Options &opts)
+bool QtCurveConfig::diffShades(const Options &opts)
 {
     if( (!USE_CUSTOM_SHADES(opts) && customShading->isChecked()) ||
         (USE_CUSTOM_SHADES(opts) && !customShading->isChecked()) )
@@ -1336,7 +1336,7 @@ bool TQtCurveConfig::diffShades(const Options &opts)
     return false;
 }
 
-void TQtCurveConfig::setPasswordChar(int ch)
+void QtCurveConfig::setPasswordChar(int ch)
 {
     TQString      str;
     TQTextOStream s(&str);
@@ -1346,20 +1346,20 @@ void TQtCurveConfig::setPasswordChar(int ch)
     passwordChar->setText(str);
 }
 
-void TQtCurveConfig::updateChanged()
+void QtCurveConfig::updateChanged()
 {
     if (settingsChanged())
         emit changed(true);
 }
 
-void TQtCurveConfig::focusChanged()
+void QtCurveConfig::focusChanged()
 {
     if(ROUND_MAX==round->currentItem() && FOCUS_LINE!=focus->currentItem())
         round->setCurrentItem(ROUND_EXTRA);
     updateChanged();
 }
 
-void TQtCurveConfig::roundChanged()
+void QtCurveConfig::roundChanged()
 {
     if(ROUND_MAX==round->currentItem() && FOCUS_LINE!=focus->currentItem())
         focus->setCurrentItem(FOCUS_LINE);
@@ -1369,7 +1369,7 @@ void TQtCurveConfig::roundChanged()
     updateChanged();
 }
 
-void TQtCurveConfig::importStyle()
+void QtCurveConfig::importStyle()
 {
     TQString file(KFileDialog::getOpenFileName(TQString::null,
                                               i18n("*"EXTENSION"|QtCurve Settings Files\n"
@@ -1380,7 +1380,7 @@ void TQtCurveConfig::importStyle()
         loadStyle(file);
 }
 
-void TQtCurveConfig::exportStyle()
+void QtCurveConfig::exportStyle()
 {
     TQString file(KFileDialog::getSaveFileName(TQString::null, i18n("*"EXTENSION"|QtCurve Settings Files"), this));
 
@@ -1402,7 +1402,7 @@ void TQtCurveConfig::exportStyle()
     }
 }
 
-void TQtCurveConfig::exportTheme()
+void QtCurveConfig::exportTheme()
 {
 #ifdef TQTC_STYLE_SUPPORT
     if(!exportDialog)
@@ -1415,7 +1415,7 @@ void TQtCurveConfig::exportTheme()
 #endif
 }
 
-void TQtCurveConfig::loadStyle(const TQString &file)
+void QtCurveConfig::loadStyle(const TQString &file)
 {
     Options opts;
 
@@ -1427,7 +1427,7 @@ void TQtCurveConfig::loadStyle(const TQString &file)
     }
 }
 
-void TQtCurveConfig::setOptions(Options &opts)
+void QtCurveConfig::setOptions(Options &opts)
 {
     opts.round=(ERound)round->currentItem();
     opts.toolbarBorders=(ETBarBorder)toolbarBorders->currentItem();
@@ -1560,7 +1560,7 @@ void TQtCurveConfig::setOptions(Options &opts)
         opts.customShades[0]=0;
 }
 
-void TQtCurveConfig::setWidgetOptions(const Options &opts)
+void QtCurveConfig::setWidgetOptions(const Options &opts)
 {
     round->setCurrentItem(opts.round);
     scrollbarType->setCurrentItem(opts.scrollbarType);
@@ -1703,7 +1703,7 @@ void TQtCurveConfig::setWidgetOptions(const Options &opts)
     populateShades(opts);
 }
 
-int TQtCurveConfig::getSquareFlags()
+int QtCurveConfig::getSquareFlags()
 {
     int square(0);
 /*
@@ -1719,7 +1719,7 @@ int TQtCurveConfig::getSquareFlags()
     return square;
 }
 
-int TQtCurveConfig::getWindowBorderFlags()
+int QtCurveConfig::getWindowBorderFlags()
 {
     int flags(0);
 
@@ -1734,7 +1734,7 @@ int TQtCurveConfig::getWindowBorderFlags()
     return flags;
 }
 
-bool TQtCurveConfig::settingsChanged()
+bool QtCurveConfig::settingsChanged()
 {
     return round->currentItem()!=currentStyle.round ||
          toolbarBorders->currentItem()!=currentStyle.toolbarBorders ||
diff --git a/config/qtcurveconfig.h b/config/qtcurveconfig.h
index c9631bc..66bd61a 100644
--- a/config/qtcurveconfig.h
+++ b/config/qtcurveconfig.h
@@ -2,7 +2,7 @@
 #define __QTCURVECONFIG_H__
 
 /*
-  TQtCurve (C) Craig Drummond, 2003 - 2010 craig.p.drummond@gmail.com
+  QtCurve (C) Craig Drummond, 2003 - 2010 craig.p.drummond@gmail.com
 
   ----
 
@@ -36,7 +36,7 @@ class KDoubleNumInput;
 class CExportThemeDialog;
 #endif
 class CStackItem;
-class TQtCurveConfig;
+class QtCurveConfig;
 
 class CGradientPreview : public TQWidget
 {
@@ -45,7 +45,7 @@ class CGradientPreview : public TQWidget
 
     public:
 
-    CGradientPreview(TQtCurveConfig *c, TQWidget *p);
+    CGradientPreview(QtCurveConfig *c, TQWidget *p);
 
     TQSize sizeHint() const;
     TQSize minimumSizeHint() const;
@@ -58,20 +58,20 @@ class CGradientPreview : public TQWidget
 
     private:
 
-    TQtCurveConfig    *cfg;
+    QtCurveConfig    *cfg;
     TQColor           color;
     GradientStopCont stops;
 };
 
-class TQtCurveConfig : public TQtCurveConfigBase
+class QtCurveConfig : public QtCurveConfigBase
 {
     Q_OBJECT
     
 
     public:
 
-    TQtCurveConfig(TQWidget *parent);
-    virtual ~TQtCurveConfig();
+    QtCurveConfig(TQWidget *parent);
+    virtual ~QtCurveConfig();
 
     EShading currentShading() const { return (EShading)shading->currentItem(); }
 
diff --git a/config/qtcurveconfigbase.ui b/config/qtcurveconfigbase.ui
index f07016d..6128767 100644
--- a/config/qtcurveconfigbase.ui
+++ b/config/qtcurveconfigbase.ui
@@ -1,8 +1,8 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>TQtCurveConfigBase</class>
+<class>QtCurveConfigBase</class>
 <widget class="TQWidget">
     <property name="name">
-        <cstring>TQtCurveConfigBase</cstring>
+        <cstring>QtCurveConfigBase</cstring>
     </property>
     <property name="geometry">
         <rect>