Fix kdevelop Qt3 compilation

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1237312 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

4 files changed, 21 insertions, 21 deletions

diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
index f6495932..0943a092 100644
--- a/parts/diff/diffpart.cpp
+++ b/parts/diff/diffpart.cpp
@@ -196,7 +196,7 @@ void DiffPart::receivedStdout( KProcess* /* p */, char* buf, int buflen )
 
 void DiffPart::receivedStderr( KProcess* /* p */, char* buf, int buflen )
 {
-  kdDebug(9033) << "received Stderr: " << TQString::fromLocal8Bit( buf, buflen ).data() << endl;
+  kdDebug(9033) << "received Stderr: " << TQString(TQString::fromLocal8Bit( buf, buflen )).ascii() << endl;
   resultErr += TQString::fromLocal8Bit( buf, buflen );
 }
 
diff --git a/parts/documentation/plugins/qt/docqtplugin.cpp b/parts/documentation/plugins/qt/docqtplugin.cpp
index 5efe880f..ee90caa0 100644
--- a/parts/documentation/plugins/qt/docqtplugin.cpp
+++ b/parts/documentation/plugins/qt/docqtplugin.cpp
@@ -57,21 +57,21 @@ private:
 };
 
 static const KDevPluginInfo data("docqtplugin");
-typedef KDevGenericFactory<DocTQtPlugin> DocTQtPluginFactory;
-K_EXPORT_COMPONENT_FACTORY( libdocqtplugin, DocTQtPluginFactory(data) )
+typedef KDevGenericFactory<DocQtPlugin> DocQtPluginFactory;
+K_EXPORT_COMPONENT_FACTORY( libdocqtplugin, DocQtPluginFactory(data) )
 
-DocTQtPlugin::DocTQtPlugin(TQObject* tqparent, const char* name, const TQStringList)
-    :DocumentationPlugin(DocTQtPluginFactory::instance()->config(), tqparent, name)
+DocQtPlugin::DocQtPlugin(TQObject* tqparent, const char* name, const TQStringList)
+    :DocumentationPlugin(DocQtPluginFactory::instance()->config(), tqparent, name)
 {
     setCapabilities(Index | FullTextSearch | CustomDocumentationTitles);
     autoSetup();
 }
 
-DocTQtPlugin::~DocTQtPlugin()
+DocQtPlugin::~DocQtPlugin()
 {
 }
 
-void DocTQtPlugin::createTOC(DocumentationCatalogItem *item)
+void DocQtPlugin::createTOC(DocumentationCatalogItem *item)
 {
     TQtDocumentationCatalogItem *qtItem = dynamic_cast<TQtDocumentationCatalogItem *>(item);
     if (!qtItem)
@@ -135,7 +135,7 @@ void DocTQtPlugin::createTOC(DocumentationCatalogItem *item)
     }
 }
 
-void DocTQtPlugin::autoSetupPlugin()
+void DocQtPlugin::autoSetupPlugin()
 {
     TQString qtDocDir(QT_DOCDIR);
     qtDocDir = URLUtil::envExpand(qtDocDir);
@@ -158,7 +158,7 @@ void DocTQtPlugin::autoSetupPlugin()
     }
 }
 
-void DocTQtPlugin::setCatalogURL(DocumentationCatalogItem *item)
+void DocQtPlugin::setCatalogURL(DocumentationCatalogItem *item)
 {
     TQtDocumentationCatalogItem *qtItem = dynamic_cast<TQtDocumentationCatalogItem *>(item);
     if (!qtItem)
@@ -190,12 +190,12 @@ void DocTQtPlugin::setCatalogURL(DocumentationCatalogItem *item)
     }
 }
 
-TQString DocTQtPlugin::pluginName() const
+TQString DocQtPlugin::pluginName() const
 {
     return i18n("TQt Documentation Collection");
 }
 
-bool DocTQtPlugin::needRefreshIndex(DocumentationCatalogItem *item)
+bool DocQtPlugin::needRefreshIndex(DocumentationCatalogItem *item)
 {
     TQtDocumentationCatalogItem *qtItem = dynamic_cast<TQtDocumentationCatalogItem *>(item);
     if (!qtItem)
@@ -213,7 +213,7 @@ bool DocTQtPlugin::needRefreshIndex(DocumentationCatalogItem *item)
         return false;
 }
 
-void DocTQtPlugin::createIndex(IndexBox *index, DocumentationCatalogItem *item)
+void DocQtPlugin::createIndex(IndexBox *index, DocumentationCatalogItem *item)
 {
     TQtDocumentationCatalogItem *qtItem = dynamic_cast<TQtDocumentationCatalogItem *>(item);
     if (!qtItem)
@@ -249,7 +249,7 @@ void DocTQtPlugin::createIndex(IndexBox *index, DocumentationCatalogItem *item)
     }
 }
 
-void DocTQtPlugin::createSectionIndex(TQFileInfo &fi, IndexBox *index, DocumentationCatalogItem *item,
+void DocQtPlugin::createSectionIndex(TQFileInfo &fi, IndexBox *index, DocumentationCatalogItem *item,
                                      TQDomElement section)
 {
     //adymo: do not load section to index for TQt reference documentation
@@ -285,7 +285,7 @@ void DocTQtPlugin::createSectionIndex(TQFileInfo &fi, IndexBox *index, Documenta
     }
 }
 
-TQStringList DocTQtPlugin::fullTextSearchLocations()
+TQStringList DocQtPlugin::fullTextSearchLocations()
 {
     TQStringList locs;
 
@@ -306,12 +306,12 @@ TQStringList DocTQtPlugin::fullTextSearchLocations()
     return locs;
 }
 
-TQPair<KFile::Mode, TQString> DocTQtPlugin::catalogLocatorProps()
+TQPair<KFile::Mode, TQString> DocQtPlugin::catalogLocatorProps()
 {
     return TQPair<KFile::Mode, TQString>(KFile::File, "*.xml *.dcf");
 }
 
-TQString DocTQtPlugin::catalogTitle(const TQString &url)
+TQString DocQtPlugin::catalogTitle(const TQString &url)
 {
     TQFileInfo fi(url);
     if (!fi.exists())
@@ -331,7 +331,7 @@ TQString DocTQtPlugin::catalogTitle(const TQString &url)
     return docEl.attribute("title", TQString());
 }
 
-DocumentationCatalogItem *DocTQtPlugin::createCatalog(KListView *contents, const TQString &title, const TQString &url)
+DocumentationCatalogItem *DocQtPlugin::createCatalog(KListView *contents, const TQString &title, const TQString &url)
 {
     return new TQtDocumentationCatalogItem(url, this, contents, title);
 }
diff --git a/parts/documentation/plugins/qt/docqtplugin.h b/parts/documentation/plugins/qt/docqtplugin.h
index 1bc1e865..afc7cf76 100644
--- a/parts/documentation/plugins/qt/docqtplugin.h
+++ b/parts/documentation/plugins/qt/docqtplugin.h
@@ -25,13 +25,13 @@
 
 class KConfig;
 
-class DocTQtPlugin : public DocumentationPlugin
+class DocQtPlugin : public DocumentationPlugin
 {
     Q_OBJECT
   TQ_OBJECT
 public:
-    DocTQtPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList());
-    ~DocTQtPlugin();
+    DocQtPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList());
+    ~DocQtPlugin();
 
     virtual TQString pluginName() const;
 
diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp
index b7d5ed2f..4734408f 100644
--- a/parts/outputviews/makewidget.cpp
+++ b/parts/outputviews/makewidget.cpp
@@ -42,7 +42,7 @@
 #include <tqfileinfo.h>
 #include <tqclipboard.h>
 #include <tqpopupmenu.h>
-#include <private/tqrichtext_p.h>
+#include <tqrichtext_p.h>
 
 #include <stdlib.h>
 #include <limits.h>