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

2 files changed, 7 insertions, 7 deletions

diff --git a/parts/documentation/plugins/custom/doccustomplugin.cpp b/parts/documentation/plugins/custom/doccustomplugin.cpp
index ae95aff1..47012a2b 100644
--- a/parts/documentation/plugins/custom/doccustomplugin.cpp
+++ b/parts/documentation/plugins/custom/doccustomplugin.cpp
@@ -32,9 +32,9 @@ static const KDevPluginInfo data("doccustomplugin");
 typedef KDevGenericFactory<DocCustomPlugin> DocCustomPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdoccustomplugin, DocCustomPluginFactory(data) )
 
-DocCustomPlugin::DocCustomPlugin(TQObject* parent, const char* name, const TQStringList // args
+DocCustomPlugin::DocCustomPlugin(TQObject* tqparent, const char* name, const TQStringList // args
                                  )
-    :DocumentationPlugin(DocCustomPluginFactory::instance()->config(), parent, name)
+    :DocumentationPlugin(DocCustomPluginFactory::instance()->config(), tqparent, name)
 {
     setCapabilities(CustomDocumentationTitles | ProjectUserManual);
     autoSetup();
@@ -62,14 +62,14 @@ DocumentationCatalogItem* DocCustomPlugin::createCatalog(KListView* contents, co
     return item;
 }
 
-QPair<KFile::Mode, TQString> DocCustomPlugin::catalogLocatorProps()
+TQPair<KFile::Mode, TQString> DocCustomPlugin::catalogLocatorProps()
 {
-    return QPair<KFile::Mode, TQString>(KFile::File, "all/allfiles");
+    return TQPair<KFile::Mode, TQString>(KFile::File, "all/allfiles");
 }
 
 TQString DocCustomPlugin::catalogTitle(const TQString& /*url*/)
 {
-    return TQString::null;
+    return TQString();
 }
 
 TQStringList DocCustomPlugin::fullTextSearchLocations()
diff --git a/parts/documentation/plugins/custom/doccustomplugin.h b/parts/documentation/plugins/custom/doccustomplugin.h
index 77bc9750..33efec8f 100644
--- a/parts/documentation/plugins/custom/doccustomplugin.h
+++ b/parts/documentation/plugins/custom/doccustomplugin.h
@@ -24,7 +24,7 @@
 
 class DocCustomPlugin : public DocumentationPlugin {
 public:
-    DocCustomPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList());
+    DocCustomPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList());
     ~DocCustomPlugin();
 
     virtual TQString pluginName() const;
@@ -39,7 +39,7 @@ public:
 
     virtual TQStringList fullTextSearchLocations();
             
-    virtual QPair<KFile::Mode, TQString> catalogLocatorProps();
+    virtual TQPair<KFile::Mode, TQString> catalogLocatorProps();
     virtual TQString catalogTitle(const TQString& url);
     
     virtual void autoSetupPlugin();