TQt4 port kdeaddons

This enables compilation under both Qt3 and Qt4


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

2 files changed, 10 insertions, 9 deletions

diff --git a/konq-plugins/minitools/minitoolsplugin.cpp b/konq-plugins/minitools/minitoolsplugin.cpp
index a1a5bfc..2346831 100644
--- a/konq-plugins/minitools/minitoolsplugin.cpp
+++ b/konq-plugins/minitools/minitoolsplugin.cpp
@@ -42,9 +42,9 @@
 typedef KGenericFactory<MinitoolsPlugin> MinitoolsPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libminitoolsplugin, MinitoolsPluginFactory("minitoolsplugin") )
 
-MinitoolsPlugin::MinitoolsPlugin(TQObject* parent, const char* name, const TQStringList &)
-   : KParts::Plugin(parent, name) {
-  m_part = (parent && parent->inherits( "KHTMLPart" )) ? static_cast<KHTMLPart*>(parent) : 0L;
+MinitoolsPlugin::MinitoolsPlugin(TQObject* tqparent, const char* name, const TQStringList &)
+   : KParts::Plugin(tqparent, name) {
+  m_part = (tqparent && tqparent->inherits( "KHTMLPart" )) ? static_cast<KHTMLPart*>(tqparent) : 0L;
 
   m_pMinitoolsMenu = new KActionMenu(i18n("&Minitools"), "minitools", actionCollection(), "minitools");
 
@@ -124,17 +124,17 @@ void MinitoolsPlugin::newBookmarkCallback(
    const TQString & text, const TQCString & url, const TQString & 
 ) {
   kdDebug(90150) << "MinitoolsPlugin::newBookmarkCallback" << text << url << endl;
-  m_minitoolsList.prepend(qMakePair(text,url));
+  m_minitoolsList.prepend(tqMakePair(text,url));
 }
 
 void MinitoolsPlugin::endFolderCallback() {
   kdDebug(90150) << "MinitoolsPlugin::endFolderCallback" << endl;
-  m_minitoolsList.prepend(qMakePair(TQString("-"),TQCString("-")));
+  m_minitoolsList.prepend(tqMakePair(TQString("-"),TQCString("-")));
 }
 
 TQString MinitoolsPlugin::minitoolsFilename(bool local) {
-  return local ? locateLocal("data", TQString::fromLatin1("konqueror/minitools.xml"))
-               : locateLocal("data", TQString::fromLatin1("konqueror/minitools-global.xml"));
+  return local ? locateLocal("data", TQString::tqfromLatin1("konqueror/minitools.xml"))
+               : locateLocal("data", TQString::tqfromLatin1("konqueror/minitools-global.xml"));
 }
 
 void MinitoolsPlugin::slotEditBookmarks() {
diff --git a/konq-plugins/minitools/minitoolsplugin.h b/konq-plugins/minitools/minitoolsplugin.h
index 04d2ae8..8607efe 100644
--- a/konq-plugins/minitools/minitoolsplugin.h
+++ b/konq-plugins/minitools/minitoolsplugin.h
@@ -34,9 +34,10 @@ class KActionMenu;
 
 class MinitoolsPlugin : public KParts::Plugin {
    Q_OBJECT
+  TQ_OBJECT
 
 public:
-   MinitoolsPlugin( TQObject* parent, const char* name, const TQStringList & );
+   MinitoolsPlugin( TQObject* tqparent, const char* name, const TQStringList & );
    ~MinitoolsPlugin();
 
 protected slots:
@@ -57,7 +58,7 @@ private:
    KHTMLPart* m_part;
    KActionMenu* m_pMinitoolsMenu;
   
-   typedef QPair<TQString,TQCString> Minitool;
+   typedef TQPair<TQString,TQCString> Minitool;
    typedef TQValueList<Minitool> MinitoolsList;
   
    MinitoolsList m_minitoolsList;