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/djvu/docdjvuplugin.cpp b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
index f9761155..77997d6b 100644
--- a/parts/documentation/plugins/djvu/docdjvuplugin.cpp
+++ b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
@@ -31,8 +31,8 @@ static const KAboutData data("docdjvuplugin", I18N_NOOP("Djvu documentation plug
 typedef KDevGenericFactory<DocDjvuPlugin> DocDjvuPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocdjvuplugin, DocDjvuPluginFactory(&data) )
 
-DocDjvuPlugin::DocDjvuPlugin(TQObject* parent, const char* name, const TQStringList args)
-    :DocumentationPlugin(DocDjvuPluginFactory::instance()->config(), parent, name)
+DocDjvuPlugin::DocDjvuPlugin(TQObject* tqparent, const char* name, const TQStringList args)
+    :DocumentationPlugin(DocDjvuPluginFactory::instance()->config(), tqparent, name)
 {
     setCapabilities(CustomDocumentationTitles | ProjectUserManual);
     autoSetup();
@@ -59,14 +59,14 @@ DocumentationCatalogItem* DocDjvuPlugin::createCatalog(KListView* contents, cons
     return item;
 }
 
-QPair<KFile::Mode, TQString> DocDjvuPlugin::catalogLocatorProps()
+TQPair<KFile::Mode, TQString> DocDjvuPlugin::catalogLocatorProps()
 {
-    return QPair<KFile::Mode, TQString>(KFile::File, "all/allfiles");
+    return TQPair<KFile::Mode, TQString>(KFile::File, "all/allfiles");
 }
 
 TQString DocDjvuPlugin::catalogTitle(const TQString& /*url*/)
 {
-    return TQString::null;
+    return TQString();
 }
 
 TQStringList DocDjvuPlugin::fullTextSearchLocations()
diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.h b/parts/documentation/plugins/djvu/docdjvuplugin.h
index 05689bd8..ec99e024 100644
--- a/parts/documentation/plugins/djvu/docdjvuplugin.h
+++ b/parts/documentation/plugins/djvu/docdjvuplugin.h
@@ -24,7 +24,7 @@
 
 class DocDjvuPlugin : public DocumentationPlugin {
 public:
-    DocDjvuPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList());
+    DocDjvuPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList());
     ~DocDjvuPlugin();
 
     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();