From a5edd20f0de599dbe7f7f00a184b78ac5156a846 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 2 Aug 2010 19:17:20 +0000 Subject: TQt conversion fixes git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1158418 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kwin/client.h | 2 +- kwin/clients/b2/b2client.h | 6 +++--- kwin/clients/default/kdedefault.h | 6 +++--- kwin/clients/keramik/keramik.h | 2 +- kwin/clients/kwmtheme/kwmthemeclient.h | 6 +++--- kwin/clients/modernsystem/modernsys.h | 4 ++-- kwin/clients/plastik/config/config.h | 4 ++-- kwin/clients/plastik/plastikbutton.h | 2 +- kwin/clients/quartz/quartz.h | 4 ++-- kwin/clients/web/Web.h | 6 +++--- kwin/kcmkwin/kwindecoration/kwindecoration.h | 10 +++++----- kwin/kcmkwin/kwindecoration/preview.h | 2 +- kwin/kcmkwin/kwinoptions/windows.cpp | 2 +- kwin/kcmkwin/kwinoptions/windows.h | 22 +++++++++++----------- kwin/kcmkwin/kwinrules/ruleslist.h | 2 +- kwin/lib/kcommondecoration.cpp | 2 +- kwin/sm.h | 2 +- kwin/tabbox.h | 2 +- kwin/tools/decobenchmark/preview.h | 2 +- kwin/useractions.cpp | 2 +- kwin/utils.cpp | 2 +- kwin/workspace.cpp | 4 ++-- kwin/workspace.h | 6 +++--- 23 files changed, 51 insertions(+), 51 deletions(-) (limited to 'kwin') diff --git a/kwin/client.h b/kwin/client.h index 806e01bec..306873a1e 100644 --- a/kwin/client.h +++ b/kwin/client.h @@ -30,7 +30,7 @@ License. See the file "COPYING" for the exact licensing terms. #include "kdecoration.h" #include "rules.h" -class QTimer; +class TQTimer; class KProcess; class KStartupInfoData; diff --git a/kwin/clients/b2/b2client.h b/kwin/clients/b2/b2client.h index 7df9a2f7d..198dfbb9b 100644 --- a/kwin/clients/b2/b2client.h +++ b/kwin/clients/b2/b2client.h @@ -17,9 +17,9 @@ #include #include -class QSpacerItem; -class QBoxLayout; -class QGridLayout; +class TQSpacerItem; +class TQBoxLayout; +class TQGridLayout; namespace B2 { diff --git a/kwin/clients/default/kdedefault.h b/kwin/clients/default/kdedefault.h index 6e09025f1..70b8847fa 100644 --- a/kwin/clients/default/kdedefault.h +++ b/kwin/clients/default/kdedefault.h @@ -20,9 +20,9 @@ #include #include -class QSpacerItem; -class QBoxLayout; -class QGridLayout; +class TQSpacerItem; +class TQBoxLayout; +class TQGridLayout; namespace Default { diff --git a/kwin/clients/keramik/keramik.h b/kwin/clients/keramik/keramik.h index 6f5a4a6e4..c90d3509f 100644 --- a/kwin/clients/keramik/keramik.h +++ b/kwin/clients/keramik/keramik.h @@ -30,7 +30,7 @@ #include "tiles.h" -class QSpacerItem; +class TQSpacerItem; namespace Keramik { diff --git a/kwin/clients/kwmtheme/kwmthemeclient.h b/kwin/clients/kwmtheme/kwmthemeclient.h index 7357f6c26..13914b2f6 100644 --- a/kwin/clients/kwmtheme/kwmthemeclient.h +++ b/kwin/clients/kwmtheme/kwmthemeclient.h @@ -7,9 +7,9 @@ #include #include -class QLabel; -class QSpacerItem; -class QGridLayout; +class TQLabel; +class TQSpacerItem; +class TQGridLayout; namespace KWMTheme { diff --git a/kwin/clients/modernsystem/modernsys.h b/kwin/clients/modernsystem/modernsys.h index 2606d8786..3e0cf02fd 100644 --- a/kwin/clients/modernsystem/modernsys.h +++ b/kwin/clients/modernsystem/modernsys.h @@ -6,8 +6,8 @@ #include #include -class QLabel; -class QSpacerItem; +class TQLabel; +class TQSpacerItem; namespace ModernSystem { diff --git a/kwin/clients/plastik/config/config.h b/kwin/clients/plastik/config/config.h index 249f5f7dd..f288c58ea 100644 --- a/kwin/clients/plastik/config/config.h +++ b/kwin/clients/plastik/config/config.h @@ -25,8 +25,8 @@ #include -class QButtonGroup; -class QGroupBox; +class TQButtonGroup; +class TQGroupBox; class KConfig; class ConfigDialog; diff --git a/kwin/clients/plastik/plastikbutton.h b/kwin/clients/plastik/plastikbutton.h index 69ba6d8e0..dbebcf63f 100644 --- a/kwin/clients/plastik/plastikbutton.h +++ b/kwin/clients/plastik/plastikbutton.h @@ -29,7 +29,7 @@ #include -class QTimer; +class TQTimer; namespace KWinPlastik { diff --git a/kwin/clients/quartz/quartz.h b/kwin/clients/quartz/quartz.h index 1133a7ae4..ddb68ced3 100644 --- a/kwin/clients/quartz/quartz.h +++ b/kwin/clients/quartz/quartz.h @@ -21,8 +21,8 @@ #include "../../lib/kcommondecoration.h" #include "../../lib/kdecorationfactory.h" -class QSpacerItem; -class QBoxLayout; +class TQSpacerItem; +class TQBoxLayout; namespace Quartz { diff --git a/kwin/clients/web/Web.h b/kwin/clients/web/Web.h index 7d7d53bfb..c8a8fa2db 100644 --- a/kwin/clients/web/Web.h +++ b/kwin/clients/web/Web.h @@ -26,9 +26,9 @@ #include "../../lib/kcommondecoration.h" #include "../../lib/kdecorationfactory.h" -class QLabel; -class QSpacerItem; -class QBoxLayout; +class TQLabel; +class TQSpacerItem; +class TQBoxLayout; namespace Web { diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.h b/kwin/kcmkwin/kwindecoration/kwindecoration.h index 126f20fa9..c4a123352 100644 --- a/kwin/kcmkwin/kwindecoration/kwindecoration.h +++ b/kwin/kcmkwin/kwindecoration/kwindecoration.h @@ -41,11 +41,11 @@ #include "kwindecorationIface.h" class KComboBox; -class QCheckBox; -class QLabel; -class QTabWidget; -class QVBox; -class QSlider; +class TQCheckBox; +class TQLabel; +class TQTabWidget; +class TQVBox; +class TQSlider; class KDecorationPlugins; class KDecorationPreview; diff --git a/kwin/kcmkwin/kwindecoration/preview.h b/kwin/kcmkwin/kwindecoration/preview.h index a7f50d682..5604df587 100644 --- a/kwin/kcmkwin/kwindecoration/preview.h +++ b/kwin/kcmkwin/kwindecoration/preview.h @@ -24,7 +24,7 @@ #include #include -class QLabel; +class TQLabel; class KDecorationPreviewBridge; class KDecorationPreviewOptions; diff --git a/kwin/kcmkwin/kwinoptions/windows.cpp b/kwin/kcmkwin/kwinoptions/windows.cpp index 1a9e88f15..cc8643af9 100644 --- a/kwin/kcmkwin/kwinoptions/windows.cpp +++ b/kwin/kcmkwin/kwinoptions/windows.cpp @@ -833,7 +833,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->layout(), KDialog::spacingHint()); - TQBoxLayout *bLay = new QVBoxLayout; + TQBoxLayout *bLay = new TQVBoxLayout; wLay->addLayout(bLay); opaque = new TQCheckBox(i18n("Di&splay content in moving windows"), windowsBox); diff --git a/kwin/kcmkwin/kwinoptions/windows.h b/kwin/kcmkwin/kwinoptions/windows.h index d236b001c..83dc70b66 100644 --- a/kwin/kcmkwin/kwinoptions/windows.h +++ b/kwin/kcmkwin/kwinoptions/windows.h @@ -26,16 +26,16 @@ #include #include -class QRadioButton; -class QCheckBox; -class QPushButton; -class QComboBox; -class QGroupBox; -class QLabel; -class QSlider; -class QButtonGroup; -class QSpinBox; -class QVButtonGroup; +class TQRadioButton; +class TQCheckBox; +class TQPushButton; +class TQComboBox; +class TQGroupBox; +class TQLabel; +class TQSlider; +class TQButtonGroup; +class TQSpinBox; +class TQVButtonGroup; class KColorButton; class KIntNumInput; @@ -66,7 +66,7 @@ class KIntNumInput; #define FOCUS_UNDER_MOUSE 2 #define FOCUS_STRICTLY_UNDER_MOUSE 3 -class QSpinBox; +class TQSpinBox; class KFocusConfig : public KCModule { diff --git a/kwin/kcmkwin/kwinrules/ruleslist.h b/kwin/kcmkwin/kwinrules/ruleslist.h index 9dacde63e..f7e7fb541 100644 --- a/kwin/kcmkwin/kwinrules/ruleslist.h +++ b/kwin/kcmkwin/kwinrules/ruleslist.h @@ -26,7 +26,7 @@ #include "../../rules.h" -class QListBoxItem; +class TQListBoxItem; namespace KWinInternal { diff --git a/kwin/lib/kcommondecoration.cpp b/kwin/lib/kcommondecoration.cpp index 32a297683..87541ad60 100644 --- a/kwin/lib/kcommondecoration.cpp +++ b/kwin/lib/kcommondecoration.cpp @@ -626,7 +626,7 @@ void KCommonDecoration::menuButtonPressed() static TQTime* t = NULL; static KCommonDecoration* lastClient = NULL; if (t == NULL) - t = new QTime; + t = new TQTime; bool dbl = (lastClient==this && t->elapsed() <= TQApplication::doubleClickInterval()); lastClient = this; t->start(); diff --git a/kwin/sm.h b/kwin/sm.h index eebbffd56..9321b3745 100644 --- a/kwin/sm.h +++ b/kwin/sm.h @@ -16,7 +16,7 @@ License. See the file "COPYING" for the exact licensing terms. #include #include -class QSocketNotifier; +class TQSocketNotifier; namespace KWinInternal { diff --git a/kwin/tabbox.h b/kwin/tabbox.h index e2c11d106..926635e7d 100644 --- a/kwin/tabbox.h +++ b/kwin/tabbox.h @@ -17,7 +17,7 @@ License. See the file "COPYING" for the exact licensing terms. #include #include "utils.h" -class QLabel; +class TQLabel; namespace KWinInternal { diff --git a/kwin/tools/decobenchmark/preview.h b/kwin/tools/decobenchmark/preview.h index c503695e1..9f2445036 100644 --- a/kwin/tools/decobenchmark/preview.h +++ b/kwin/tools/decobenchmark/preview.h @@ -24,7 +24,7 @@ #include #include -class QLabel; +class TQLabel; class KDecorationPreviewBridge; class KDecorationPreviewOptions; diff --git a/kwin/useractions.cpp b/kwin/useractions.cpp index 2c3ea8d4d..88bfaf035 100644 --- a/kwin/useractions.cpp +++ b/kwin/useractions.cpp @@ -48,7 +48,7 @@ TQPopupMenu* Workspace::clientPopup() { if ( !popup ) { - popup = new QPopupMenu; + popup = new TQPopupMenu; popup->setCheckable( TRUE ); popup->setFont(KGlobalSettings::menuFont()); connect( popup, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( clientPopupAboutToShow() ) ); diff --git a/kwin/utils.cpp b/kwin/utils.cpp index 7a3e3541d..33bdd6299 100644 --- a/kwin/utils.cpp +++ b/kwin/utils.cpp @@ -258,7 +258,7 @@ void updateXTime() { static TQWidget* w = 0; if ( !w ) - w = new QWidget; + w = new TQWidget; long data = 1; XChangeProperty(qt_xdisplay(), w->winId(), atoms->kwin_running, atoms->kwin_running, 32, PropModeAppend, (unsigned char*) &data, 1); diff --git a/kwin/workspace.cpp b/kwin/workspace.cpp index 7b87818f0..fe008c399 100644 --- a/kwin/workspace.cpp +++ b/kwin/workspace.cpp @@ -219,7 +219,7 @@ void Workspace::init() // topDock = 0L; // maximizedWindowCounter = 0; - supportWindow = new QWidget; + supportWindow = new TQWidget; XLowerWindow( qt_xdisplay(), supportWindow->winId()); // see usage in layers.cpp XSetWindowAttributes attr; @@ -2416,7 +2416,7 @@ void Workspace::setupTopMenuHandling() connect( topmenu_selection, TQT_SIGNAL( lostOwnership()), this, TQT_SLOT( lostTopMenuSelection())); disconnect( topmenu_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( lostTopMenuOwner())); managing_topmenus = true; - topmenu_space = new QWidget; + topmenu_space = new TQWidget; Window stack[ 2 ]; stack[ 0 ] = supportWindow->winId(); stack[ 1 ] = topmenu_space->winId(); diff --git a/kwin/workspace.h b/kwin/workspace.h index 64622d435..d369497da 100644 --- a/kwin/workspace.h +++ b/kwin/workspace.h @@ -26,15 +26,15 @@ License. See the file "COPYING" for the exact licensing terms. #include -class QPopupMenu; +class TQPopupMenu; class KConfig; class KGlobalAccel; class KShortcutDialog; class KStartupInfo; class KStartupInfoId; class KStartupInfoData; -class QSlider; -class QPushButton; +class TQSlider; +class TQPushButton; class KProcess; namespace KWinInternal -- cgit v1.2.1