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, 9 insertions, 8 deletions

diff --git a/konq-plugins/crashes/crashesplugin.cpp b/konq-plugins/crashes/crashesplugin.cpp
index b1e1f6f..5e04b1a 100644
--- a/konq-plugins/crashes/crashesplugin.cpp
+++ b/konq-plugins/crashes/crashesplugin.cpp
@@ -37,10 +37,10 @@
 typedef KGenericFactory<CrashesPlugin> CrashesPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libcrashesplugin, CrashesPluginFactory( "crashesplugin" ) )
 
-CrashesPlugin::CrashesPlugin( TQObject* parent, const char* name, const TQStringList & )
-: KParts::Plugin( parent, name )
+CrashesPlugin::CrashesPlugin( TQObject* tqparent, const char* name, const TQStringList & )
+: KParts::Plugin( tqparent, name )
 {
-  m_part = (parent && parent->inherits( "KHTMLPart" )) ? static_cast<KHTMLPart*>(parent) : 0L;
+  m_part = (tqparent && tqparent->inherits( "KHTMLPart" )) ? static_cast<KHTMLPart*>(tqparent) : 0L;
 
   m_pCrashesMenu = new KActionMenu( i18n("&Crashes"), "core",
                                actionCollection(), "crashes" );
@@ -139,12 +139,12 @@ void CrashesPlugin::slotAboutToShow()
 void CrashesPlugin::newBookmarkCallback( const TQString & text, const TQCString & url,
                                          const TQString & )
 {
-  m_crashesList.prepend(qMakePair(text,url));
+  m_crashesList.prepend(tqMakePair(text,url));
 }
 
 void CrashesPlugin::endFolderCallback( )
 {
-  m_crashesList.prepend(qMakePair(TQString("-"),TQCString("-")));
+  m_crashesList.prepend(tqMakePair(TQString("-"),TQCString("-")));
 }
 
 void CrashesPlugin::slotClearCrashes() {
diff --git a/konq-plugins/crashes/crashesplugin.h b/konq-plugins/crashes/crashesplugin.h
index 3c6a402..0af567e 100644
--- a/konq-plugins/crashes/crashesplugin.h
+++ b/konq-plugins/crashes/crashesplugin.h
@@ -35,9 +35,10 @@ class KActionMenu;
 class CrashesPlugin : public KParts::Plugin
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  CrashesPlugin( TQObject* parent, const char* name,
+  CrashesPlugin( TQObject* tqparent, const char* name,
                    const TQStringList & );
   ~CrashesPlugin();
 
@@ -55,12 +56,12 @@ private:
   KHTMLPart* m_part;
   KActionMenu* m_pCrashesMenu;
 
-  typedef QPair<TQString,TQCString> Crash;
+  typedef TQPair<TQString,TQCString> Crash;
   typedef TQValueList<Crash> CrashesList;
 
   CrashesList m_crashesList;
 
-  typedef QPair<int, int> CrashRange;
+  typedef TQPair<int, int> CrashRange;
   typedef TQValueList<CrashRange> CrashRangesList;
 
   CrashRangesList m_crashRangesList;