From 8f14fb0418241694e61cb35dda95fea6d9b7830d Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 2 Aug 2010 19:23:47 +0000 Subject: TQt conversion fixes git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1158447 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdeui/tests/itemcontainertest.h | 4 ++-- kdeui/tests/kcomboboxtest.h | 6 +++--- kdeui/tests/kcompletiontest.cpp | 12 ++++++------ kdeui/tests/kcompletiontest.h | 16 ++++++++-------- kdeui/tests/kdocktest.h | 2 +- kdeui/tests/kdockwidgetdemo.h | 12 ++++++------ kdeui/tests/kdockwidgettest.h | 2 +- kdeui/tests/klineedittest.h | 4 ++-- kdeui/tests/krulertest.h | 10 +++++----- kdeui/tests/kstatusbartest.cpp | 4 ++-- kdeui/tests/kstatusbartest.h | 2 +- kdeui/tests/ktabctltest.h | 4 ++-- kdeui/tests/kwindowtest.cpp | 8 ++++---- kdeui/tests/kwindowtest.h | 2 +- kdeui/tests/kwizardtest.cpp | 2 +- 15 files changed, 45 insertions(+), 45 deletions(-) (limited to 'kdeui/tests') diff --git a/kdeui/tests/itemcontainertest.h b/kdeui/tests/itemcontainertest.h index 01f7c006c..9af239c60 100644 --- a/kdeui/tests/itemcontainertest.h +++ b/kdeui/tests/itemcontainertest.h @@ -6,8 +6,8 @@ class KIconView; class KListView; class KListBox; -class QButtonGroup; -class QLabel; +class TQButtonGroup; +class TQLabel; class TopLevel : public QWidget { diff --git a/kdeui/tests/kcomboboxtest.h b/kdeui/tests/kcomboboxtest.h index 3321b7f43..ac6d48338 100644 --- a/kdeui/tests/kcomboboxtest.h +++ b/kdeui/tests/kcomboboxtest.h @@ -3,9 +3,9 @@ #include -class QTimer; -class QComboBox; -class QPushButton; +class TQTimer; +class TQComboBox; +class TQPushButton; class KComboBox; diff --git a/kdeui/tests/kcompletiontest.cpp b/kdeui/tests/kcompletiontest.cpp index a0eba1bfd..bdd47ab48 100644 --- a/kdeui/tests/kcompletiontest.cpp +++ b/kdeui/tests/kcompletiontest.cpp @@ -46,11 +46,11 @@ Form1::Form1( TQWidget* parent, const char* name ) GroupBox1Layout->setSpacing( 6 ); GroupBox1Layout->setMargin( 11 ); - Layout9 = new QVBoxLayout; + Layout9 = new TQVBoxLayout; Layout9->setSpacing( 6 ); Layout9->setMargin( 0 ); - Layout1 = new QHBoxLayout; + Layout1 = new TQHBoxLayout; Layout1->setSpacing( 6 ); Layout1->setMargin( 0 ); @@ -66,7 +66,7 @@ Form1::Form1( TQWidget* parent, const char* name ) edit->setFocus(); TQToolTip::add( edit, "right-click to change completion mode" ); - Layout2 = new QHBoxLayout; + Layout2 = new TQHBoxLayout; Layout2->setSpacing( 6 ); Layout2->setMargin( 0 ); @@ -88,7 +88,7 @@ Form1::Form1( TQWidget* parent, const char* name ) Layout2->addWidget( PushButton1 ); Layout9->addLayout( Layout2 ); - Layout3 = new QHBoxLayout; + Layout3 = new TQHBoxLayout; Layout3->setSpacing( 6 ); Layout3->setMargin( 0 ); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); @@ -100,7 +100,7 @@ Form1::Form1( TQWidget* parent, const char* name ) Layout3->addWidget( PushButton1_4 ); Layout9->addLayout( Layout3 ); - Layout8 = new QHBoxLayout; + Layout8 = new TQHBoxLayout; Layout8->setSpacing( 6 ); Layout8->setMargin( 0 ); @@ -110,7 +110,7 @@ Form1::Form1( TQWidget* parent, const char* name ) TQT_SLOT( slotHighlighted( const TQString& ))); TQToolTip::add( ListBox1, "Contains the contents of the completion object.\n:x is the weighting, i.e. how often an item has been inserted"); - Layout7 = new QVBoxLayout; + Layout7 = new TQVBoxLayout; Layout7->setSpacing( 6 ); Layout7->setMargin( 0 ); diff --git a/kdeui/tests/kcompletiontest.h b/kdeui/tests/kcompletiontest.h index f40a6292d..55b01a82d 100644 --- a/kdeui/tests/kcompletiontest.h +++ b/kdeui/tests/kcompletiontest.h @@ -12,14 +12,14 @@ #include #include #include -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QGroupBox; -class QLabel; -class QListBox; -class QListBoxItem; -class QPushButton; +class TQVBoxLayout; +class TQHBoxLayout; +class TQGridLayout; +class TQGroupBox; +class TQLabel; +class TQListBox; +class TQListBoxItem; +class TQPushButton; class KHistoryCombo; class KLineEdit; diff --git a/kdeui/tests/kdocktest.h b/kdeui/tests/kdocktest.h index 6efbeed57..f23d22a35 100644 --- a/kdeui/tests/kdocktest.h +++ b/kdeui/tests/kdocktest.h @@ -3,7 +3,7 @@ #include -class QWidget; +class TQWidget; class DockTest : public KDockArea { Q_OBJECT diff --git a/kdeui/tests/kdockwidgetdemo.h b/kdeui/tests/kdockwidgetdemo.h index 37d31b137..ff9b1451b 100644 --- a/kdeui/tests/kdockwidgetdemo.h +++ b/kdeui/tests/kdockwidgetdemo.h @@ -16,12 +16,12 @@ #include #include -class QMultiLineEdit; -class QTextView; -class QToolButton; -class QSpinBox; -class QShowEvent; -class QPopupMenu; +class TQMultiLineEdit; +class TQTextView; +class TQToolButton; +class TQSpinBox; +class TQShowEvent; +class TQPopupMenu; class DirectoryView; class CustomFileDialog; diff --git a/kdeui/tests/kdockwidgettest.h b/kdeui/tests/kdockwidgettest.h index f5905262f..7ae2ab271 100644 --- a/kdeui/tests/kdockwidgettest.h +++ b/kdeui/tests/kdockwidgettest.h @@ -19,7 +19,7 @@ #include #include #include -class QPushButton; +class TQPushButton; class DockApplication : public KDockMainWindow {Q_OBJECT diff --git a/kdeui/tests/klineedittest.h b/kdeui/tests/klineedittest.h index 4a07dc812..fc2b74a30 100644 --- a/kdeui/tests/klineedittest.h +++ b/kdeui/tests/klineedittest.h @@ -4,8 +4,8 @@ #include #include -class QString; -class QPushButton; +class TQString; +class TQPushButton; class KLineEdit; diff --git a/kdeui/tests/krulertest.h b/kdeui/tests/krulertest.h index 20ee8d372..fe552467c 100644 --- a/kdeui/tests/krulertest.h +++ b/kdeui/tests/krulertest.h @@ -12,11 +12,11 @@ #include class KRuler; -class QWidget; -class QFrame; -class QGridLayout; -class QCheckBox; -class QGroupBox; +class TQWidget; +class TQFrame; +class TQGridLayout; +class TQCheckBox; +class TQGroupBox; class MouseWidget : public QFrame diff --git a/kdeui/tests/kstatusbartest.cpp b/kdeui/tests/kstatusbartest.cpp index a85689494..669044c55 100644 --- a/kdeui/tests/kstatusbartest.cpp +++ b/kdeui/tests/kstatusbartest.cpp @@ -20,7 +20,7 @@ testWindow::testWindow (TQWidget *, const char *name) { // Setup Menus menuBar = new KMenuBar (this); - fileMenu = new QPopupMenu; + fileMenu = new TQPopupMenu; menuBar->insertItem ("&File", fileMenu); fileMenu->insertItem ("&Exit", KApplication::kApplication(), TQT_SLOT( quit() ), ALT + Key_Q ); @@ -43,7 +43,7 @@ testWindow::testWindow (TQWidget *, const char *name) setCaption( KApplication::kApplication()->caption() ); - smenu = new QPopupMenu; + smenu = new TQPopupMenu; smenu->insertItem("50%"); smenu->insertItem("75%"); diff --git a/kdeui/tests/kstatusbartest.h b/kdeui/tests/kstatusbartest.h index aa9aded27..37f500334 100644 --- a/kdeui/tests/kstatusbartest.h +++ b/kdeui/tests/kstatusbartest.h @@ -6,7 +6,7 @@ #include #include -class QMultiLineEdit; +class TQMultiLineEdit; class testWindow : public KMainWindow { diff --git a/kdeui/tests/ktabctltest.h b/kdeui/tests/ktabctltest.h index 0090de1c9..8b4632411 100644 --- a/kdeui/tests/ktabctltest.h +++ b/kdeui/tests/ktabctltest.h @@ -7,8 +7,8 @@ #include class KTabCtl; -class QPushButton; -class QMultiLineEdit; +class TQPushButton; +class TQMultiLineEdit; class TopLevel : public QWidget { diff --git a/kdeui/tests/kwindowtest.cpp b/kdeui/tests/kwindowtest.cpp index 288ab554f..0615d492f 100644 --- a/kdeui/tests/kwindowtest.cpp +++ b/kdeui/tests/kwindowtest.cpp @@ -49,7 +49,7 @@ setAutoSaveSettings(); menuBar = new KMenuBar (this); // First popup... - fileMenu = new QPopupMenu; + fileMenu = new TQPopupMenu; // We insert this popup in menubar with caption "File". // Prefix "&" means that "F" will be underlined menuBar->insertItem ("&File", fileMenu); @@ -59,12 +59,12 @@ setAutoSaveSettings(); TQT_SLOT( quit() ), ALT + Key_Q ); // Another popup... - toolBarMenu = new QPopupMenu; + toolBarMenu = new TQPopupMenu; menuBar->insertItem ("&Toolbars", toolBarMenu); toolBarMenu->insertItem ("(Un)Hide tollbar 1", this, TQT_SLOT(slotHide1())); toolBarMenu->insertItem ("(Un)Hide tollbar 2", this, TQT_SLOT(slotHide2())); - itemsMenu = new QPopupMenu; + itemsMenu = new TQPopupMenu; menuBar->insertItem ("&Items", itemsMenu); exitB = true; // exit button is shown @@ -232,7 +232,7 @@ setAutoSaveSettings(); // This is not strictly related to toolbars, menubars or KMainWindow. // Setup popup for completions - completions = new QPopupMenu; + completions = new TQPopupMenu; completions->insertItem("/"); completions->insertItem("/usr/"); diff --git a/kdeui/tests/kwindowtest.h b/kdeui/tests/kwindowtest.h index 4441b6caa..14e2a6da8 100644 --- a/kdeui/tests/kwindowtest.h +++ b/kdeui/tests/kwindowtest.h @@ -9,7 +9,7 @@ #include #include -class QMultiLineEdit; +class TQMultiLineEdit; class KToolBarRadioGroup; class KHelpMenu; diff --git a/kdeui/tests/kwizardtest.cpp b/kdeui/tests/kwizardtest.cpp index 960929f8c..91974263e 100644 --- a/kdeui/tests/kwizardtest.cpp +++ b/kdeui/tests/kwizardtest.cpp @@ -33,7 +33,7 @@ int main(int argc, char **argv) &a, TQT_SLOT(quit())); for(int i = 1; i < 11; i++) { - TQWidget *p = new QWidget; + TQWidget *p = new TQWidget; TQString msg = TQString("This is page %1 out of 10").arg(i); TQLabel *label = new TQLabel(msg, p); TQHBoxLayout *layout = new TQHBoxLayout(p, 5); -- cgit v1.2.1