From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 14 Jun 2011 16:45:05 +0000
Subject: TQt4 port kdevelop This enables compilation under both Qt3 and Qt4

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 buildtools/lib/parsers/autotools/tests/viewer.cpp  | 18 +++++-----
 buildtools/lib/parsers/autotools/tests/viewer.h    |  5 +--
 .../lib/parsers/autotools/tests/viewer_main.cpp    |  2 +-
 .../lib/parsers/autotools/tests/viewerbase.ui      | 40 +++++++++++-----------
 4 files changed, 33 insertions(+), 32 deletions(-)

(limited to 'buildtools/lib/parsers/autotools/tests')

diff --git a/buildtools/lib/parsers/autotools/tests/viewer.cpp b/buildtools/lib/parsers/autotools/tests/viewer.cpp
index 0dc8e733..66401c2c 100644
--- a/buildtools/lib/parsers/autotools/tests/viewer.cpp
+++ b/buildtools/lib/parsers/autotools/tests/viewer.cpp
@@ -34,8 +34,8 @@
 
 using namespace AutoTools;
 
-Viewer::Viewer(TQWidget *parent, const char *name)
-    :ViewerBase(parent, name)
+Viewer::Viewer(TQWidget *tqparent, const char *name)
+    :ViewerBase(tqparent, name)
 {
     if (TQFile::exists(TQDir::currentDirPath() + "/" + "qtlist"))
     {
@@ -46,7 +46,7 @@ Viewer::Viewer(TQWidget *parent, const char *name)
             files->insertItem(str.readLine());
     }
     ast->setSorting(-1);
-    parentProject.push((TQListViewItem*)0);
+    tqparentProject.push((TQListViewItem*)0);
 }
 
 void Viewer::addAll_clicked()
@@ -99,12 +99,12 @@ void Viewer::tabWidget2_selected(const TQString& text)
 void Viewer::processAST(ProjectAST *projectAST, TQListViewItem *globAfter)
 {
     TQListViewItem *projectIt;
-    if (!parentProject.top())
+    if (!tqparentProject.top())
         projectIt = new TQListViewItem(ast, "Project");
     else
     {
         if ( projectAST->isConditionalScope() || projectAST->isRule() )
-            projectIt = new TQListViewItem(parentProject.top(), globAfter, projectAST->scopedID);
+            projectIt = new TQListViewItem(tqparentProject.top(), globAfter, projectAST->scopedID);
     }
     projectIt->setOpen(true);
     
@@ -128,7 +128,7 @@ void Viewer::processAST(ProjectAST *projectAST, TQListViewItem *globAfter)
 		{
 			AutomakeTargetAST* ata = static_cast<AutomakeTargetAST*>(ast);
 			TQListViewItem* item = new TQListViewItem(projectIt, after,
-					ata->target, TQString::null, ata->deps.join(""));
+					ata->target, TQString(), ata->deps.join(""));
 			after = item;
 		}
 		break;
@@ -145,14 +145,14 @@ void Viewer::processAST(ProjectAST *projectAST, TQListViewItem *globAfter)
 		{
 			ConditionAST* ata = static_cast<ConditionAST*>(ast);
 			TQListViewItem* item = new TQListViewItem(projectIt, after,
-					ata->type, ata->conditionName, TQString::null );
+					ata->type, ata->conditionName, TQString() );
 			after = item;
 		}
 	case AST::ProjectAST: {
 		ProjectAST *projectAST = static_cast<ProjectAST*>(ast);
-		parentProject.push(projectIt);
+		tqparentProject.push(projectIt);
 		processAST(projectAST, after);
-		parentProject.pop(); }
+		tqparentProject.pop(); }
 		break;
 	}
     }
diff --git a/buildtools/lib/parsers/autotools/tests/viewer.h b/buildtools/lib/parsers/autotools/tests/viewer.h
index 5ee63c54..c0653020 100644
--- a/buildtools/lib/parsers/autotools/tests/viewer.h
+++ b/buildtools/lib/parsers/autotools/tests/viewer.h
@@ -30,8 +30,9 @@ class TQListViewItem;
 
 class Viewer: public ViewerBase {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    Viewer(TQWidget *parent = 0, const char *name = 0);
+    Viewer(TQWidget *tqparent = 0, const char *name = 0);
     void processAST(AutoTools::ProjectAST *projectAST, TQListViewItem *globAfter = 0);
 public slots:
     virtual void tabWidget2_selected(const TQString&);
@@ -40,7 +41,7 @@ public slots:
     virtual void addAll_clicked();
 private:
     AutoTools::ProjectAST *projectAST;
-    TQValueStack<TQListViewItem *> parentProject;
+    TQValueStack<TQListViewItem *> tqparentProject;
 };
 
 #endif
diff --git a/buildtools/lib/parsers/autotools/tests/viewer_main.cpp b/buildtools/lib/parsers/autotools/tests/viewer_main.cpp
index 380767a9..0fc5157b 100644
--- a/buildtools/lib/parsers/autotools/tests/viewer_main.cpp
+++ b/buildtools/lib/parsers/autotools/tests/viewer_main.cpp
@@ -28,7 +28,7 @@ int main(int argc, char **argv)
     app.setMainWidget(&viewer);
     viewer.show();
     viewer.resize(800, 600);
-    //viewer.setWindowState(viewer.windowState() | Qt::WindowMaximized);
+    //viewer.setWindowState(viewer.windowState() | TQt::WindowMaximized);
     
     return app.exec();
 }
diff --git a/buildtools/lib/parsers/autotools/tests/viewerbase.ui b/buildtools/lib/parsers/autotools/tests/viewerbase.ui
index 7c228299..75ed7559 100644
--- a/buildtools/lib/parsers/autotools/tests/viewerbase.ui
+++ b/buildtools/lib/parsers/autotools/tests/viewerbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>ViewerBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ViewerBase</cstring>
     </property>
@@ -19,15 +19,15 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="0" column="1" rowspan="4" colspan="1">
+        <widget class="TQLayoutWidget" row="0" column="1" rowspan="4" colspan="1">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QTextEdit">
+                <widget class="TQTextEdit">
                     <property name="name">
                         <cstring>source</cstring>
                     </property>
@@ -40,7 +40,7 @@
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QTabWidget">
+                <widget class="TQTabWidget">
                     <property name="name">
                         <cstring>tabWidget2</cstring>
                     </property>
@@ -52,7 +52,7 @@
                             <verstretch>2</verstretch>
                         </sizepolicy>
                     </property>
-                    <widget class="QWidget">
+                    <widget class="TQWidget">
                         <property name="name">
                             <cstring>tab</cstring>
                         </property>
@@ -63,7 +63,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QListView" row="0" column="0">
+                            <widget class="TQListView" row="0" column="0">
                                 <column>
                                     <property name="text">
                                         <string>Name</string>
@@ -103,7 +103,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QWidget">
+                    <widget class="TQWidget">
                         <property name="name">
                             <cstring>tab</cstring>
                         </property>
@@ -114,7 +114,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QTextEdit" row="0" column="0">
+                            <widget class="TQTextEdit" row="0" column="0">
                                 <property name="name">
                                     <cstring>writeBack</cstring>
                                 </property>
@@ -124,22 +124,22 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLineEdit" row="0" column="0">
+        <widget class="TQLineEdit" row="0" column="0">
             <property name="name">
                 <cstring>allLocation</cstring>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>150</width>
                     <height>32767</height>
                 </size>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="0">
+        <widget class="TQPushButton" row="1" column="0">
             <property name="name">
                 <cstring>addAll</cstring>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>150</width>
                     <height>32767</height>
@@ -149,11 +149,11 @@
                 <string>Add All From Directory</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="2" column="0">
+        <widget class="TQPushButton" row="2" column="0">
             <property name="name">
                 <cstring>choose</cstring>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>150</width>
                     <height>32767</height>
@@ -163,7 +163,7 @@
                 <string>Choose File to Add...</string>
             </property>
         </widget>
-        <widget class="QListBox" row="3" column="0">
+        <widget class="TQListBox" row="3" column="0">
             <property name="name">
                 <cstring>files</cstring>
             </property>
@@ -175,7 +175,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>150</width>
                     <height>32767</height>
@@ -210,11 +210,11 @@
         <slot>tabWidget2_selected(const QString&amp;)</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>addAll_clicked()</slot>
     <slot>choose_clicked()</slot>
     <slot>files_currentChanged(QListBoxItem*)</slot>
     <slot>tabWidget2_selected(const QString&amp;)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
-- 
cgit v1.2.3