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

5 files changed, 29 insertions, 27 deletions

diff --git a/parts/partexplorer/partexplorer_plugin.cpp b/parts/partexplorer/partexplorer_plugin.cpp
index dbf2b554..5f6ae0f0 100644
--- a/parts/partexplorer/partexplorer_plugin.cpp
+++ b/parts/partexplorer/partexplorer_plugin.cpp
@@ -28,8 +28,8 @@ static const KDevPluginInfo data("kdevpartexplorer");
 typedef KDevGenericFactory<PartExplorerPlugin> PartExplorerPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevpartexplorer, PartExplorerPluginFactory( data ) )
 
-PartExplorerPlugin::PartExplorerPlugin(  TQObject *parent, const char *name, const TQStringList & )
-    : KDevPlugin( &data, parent, name ? name : "PartExplorerPlugin" )
+PartExplorerPlugin::PartExplorerPlugin(  TQObject *tqparent, const char *name, const TQStringList & )
+    : KDevPlugin( &data, tqparent, name ? name : "PartExplorerPlugin" )
 {
     // we need an instance
     setInstance( PartExplorerPluginFactory::instance() );
diff --git a/parts/partexplorer/partexplorer_plugin.h b/parts/partexplorer/partexplorer_plugin.h
index 528d2a45..826ae6ed 100644
--- a/parts/partexplorer/partexplorer_plugin.h
+++ b/parts/partexplorer/partexplorer_plugin.h
@@ -24,11 +24,12 @@ class PartExplorerForm;
 class PartExplorerPlugin : public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
     * Default constructor
     */
-    PartExplorerPlugin(  TQObject *parent, const char *name, const TQStringList & );
+    PartExplorerPlugin(  TQObject *tqparent, const char *name, const TQStringList & );
 
     /**
     * Destructor
diff --git a/parts/partexplorer/partexplorerform.cpp b/parts/partexplorer/partexplorerform.cpp
index f944b393..d8b0cccf 100644
--- a/parts/partexplorer/partexplorerform.cpp
+++ b/parts/partexplorer/partexplorerform.cpp
@@ -35,9 +35,9 @@ namespace PartExplorer{
 class PropertyItem : public KListViewItem
 {
 public:
-    PropertyItem( KListViewItem *parent, const TQString &propertyName,
+    PropertyItem( KListViewItem *tqparent, const TQString &propertyName,
         const TQString &propertyType, const TQString &propertyValue )
-        : KListViewItem( parent )
+        : KListViewItem( tqparent )
     {
         setText( 0, propertyName );
         setText( 1, propertyType );
@@ -47,7 +47,7 @@ public:
     TQString tipText() const
     {
         TQString tip = i18n("Name: %1 | Type: %2 | Value: %3");
-        return tip.arg( text(0) ).arg( text(1) ).arg( text(2) );
+        return tip.tqarg( text(0) ).tqarg( text(1) ).tqarg( text(2) );
     }
 };
 
@@ -58,10 +58,10 @@ public:
 
 class ResultList;
 
-class ResultsToolTip: public QToolTip
+class ResultsToolTip: public TQToolTip
 {
 public:
-    ResultsToolTip( ResultsList* parent );
+    ResultsToolTip( ResultsList* tqparent );
     virtual void maybeTip( const TQPoint& p );
 
 private:
@@ -71,8 +71,8 @@ private:
 class ResultsList : public KListView
 {
 public:
-    ResultsList( TQWidget *parent )
-        : KListView( parent, "resultslist" )
+    ResultsList( TQWidget *tqparent )
+        : KListView( tqparent, "resultslist" )
     {
         this->setShowToolTips( false );
         new ResultsToolTip( this );
@@ -86,8 +86,8 @@ public:
     }
 };
 
-ResultsToolTip::ResultsToolTip( ResultsList* parent )
-    : TQToolTip( parent->viewport() ), m_resultsList( parent )
+ResultsToolTip::ResultsToolTip( ResultsList* tqparent )
+    : TQToolTip( tqparent->viewport() ), m_resultsList( tqparent )
 {
 }
 
@@ -96,7 +96,7 @@ void ResultsToolTip::maybeTip( const TQPoint& p )
     PartExplorer::PropertyItem *item = dynamic_cast<PartExplorer::PropertyItem*>( m_resultsList->itemAt( p ) );
     if ( item )
     {
-        TQRect r = m_resultsList->itemRect( item );
+        TQRect r = m_resultsList->tqitemRect( item );
         if ( r.isValid() )
             tip( r, item->tipText() );
     }
@@ -107,8 +107,8 @@ void ResultsToolTip::maybeTip( const TQPoint& p )
 // class PartExplorerForm
 ///////////////////////////////////////////////////////////////////////////////
 
-PartExplorerForm::PartExplorerForm( TQWidget *parent )
-    : KDialogBase( parent, "parteplorerform", false,
+PartExplorerForm::PartExplorerForm( TQWidget *tqparent )
+    : KDialogBase( tqparent, "parteplorerform", false,
         i18n("Part Explorer - A Services Lister"), User1 | Close, User1, true )
 {
     m_base = new PartExplorerFormBase( this, "partexplorerformbase", 0 );
@@ -116,12 +116,12 @@ PartExplorerForm::PartExplorerForm( TQWidget *parent )
     m_resultsList->addColumn( i18n( "Property" ) );
     m_resultsList->addColumn( i18n( "Type" ) );
     m_resultsList->addColumn( i18n( "Value" ) );
-    m_resultsList->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3,
+    m_resultsList->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3,
         (TQSizePolicy::SizeType)3, 0, 0,
         m_resultsList->sizePolicy().hasHeightForWidth() ) );
     TQWhatsThis::add( m_resultsList, i18n("<b>Matching services</b><p>Results (if any) are shown grouped by matching service name.") );
     m_base->resultsLabel->setBuddy(m_resultsList);
-    m_base->layout()->add( m_resultsList );
+    m_base->tqlayout()->add( m_resultsList );
     setMainWidget( m_base );
     m_base->typeCombo->lineEdit()->setFocus();
 
@@ -212,7 +212,7 @@ void PartExplorerForm::fillServiceList( const KTrader::OfferList &services )
             TQVariant property = service->property( propertyName );
             TQString propertyType = property.typeName();
             TQString propertyValue;
-            if (propertyType == "TQStringList") {
+            if (propertyType == TQSTRINGLIST_OBJECT_NAME_STRING) {
                 propertyValue = property.toStringList().join(", ");
             }
             else {
@@ -220,7 +220,7 @@ void PartExplorerForm::fillServiceList( const KTrader::OfferList &services )
             }
 
             TQString dProperty = " *** Found property < %1, %2, %3 >";
-            dProperty = dProperty.arg( propertyName ).arg( propertyType ).arg( propertyValue );
+            dProperty = dProperty.tqarg( propertyName ).tqarg( propertyType ).tqarg( propertyValue );
             kdDebug( 9000 ) << dProperty << endl;
 
             new PartExplorer::PropertyItem( serviceItem, propertyName, propertyType, propertyValue );
diff --git a/parts/partexplorer/partexplorerform.h b/parts/partexplorer/partexplorerform.h
index 7ccc140d..c28c37c0 100644
--- a/parts/partexplorer/partexplorerform.h
+++ b/parts/partexplorer/partexplorerform.h
@@ -26,8 +26,9 @@ class PartExplorerFormBase;
 class PartExplorerForm : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    PartExplorerForm( TQWidget *parent = 0 );
+    PartExplorerForm( TQWidget *tqparent = 0 );
     virtual ~PartExplorerForm();
 
     /**
diff --git a/parts/partexplorer/partexplorerformbase.ui b/parts/partexplorer/partexplorerformbase.ui
index dd9beeb3..1928ad80 100644
--- a/parts/partexplorer/partexplorerformbase.ui
+++ b/parts/partexplorer/partexplorerformbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>PartExplorerFormBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>PartExplorerFormBase</cstring>
     </property>
@@ -30,7 +30,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -63,7 +63,7 @@
                 <bool>false</bool>
             </property>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel1_2</cstring>
             </property>
@@ -85,7 +85,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QTextEdit">
+        <widget class="TQTextEdit">
             <property name="name">
                 <cstring>constraintsText</cstring>
             </property>
@@ -104,7 +104,7 @@
                 <string>&lt;b&gt;Constraints&lt;/b&gt;Refine your query by writing additional constraints such as &lt;i&gt;([X-KDevelop-Scope]='Global')&lt;/i&gt;).</string>
             </property>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>resultsLabel</cstring>
             </property>
@@ -130,8 +130,8 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>