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

4 files changed, 12 insertions, 10 deletions

diff --git a/kate/filelistloader/katefll_initplugin.cpp b/kate/filelistloader/katefll_initplugin.cpp
index 8fb8061..5d70f46 100644
--- a/kate/filelistloader/katefll_initplugin.cpp
+++ b/kate/filelistloader/katefll_initplugin.cpp
@@ -30,8 +30,8 @@
                                      
 K_EXPORT_COMPONENT_FACTORY( katefll_initplugin, KGenericFactory<InitPluginKateFileListLoader>( "katefll_loader" ) )
 
-InitPluginKateFileListLoader::InitPluginKateFileListLoader (TQObject * parent, const char *name, const TQStringList datalist)
-	:InitPlugin((Kate::Application*)parent,name)
+InitPluginKateFileListLoader::InitPluginKateFileListLoader (TQObject * tqparent, const char *name, const TQStringList datalist)
+	:InitPlugin((Kate::Application*)tqparent,name)
 {
 }
 
@@ -83,11 +83,11 @@ int InitPluginKateFileListLoader::initKate()
 			updateInit();
 			disconnect(this,TQT_SIGNAL(updateInit()),pl,TQT_SLOT(updateInit()));
 			
-/*      		int id = pl->metaObject()->findSlot( TQT_SLOT(updateInit()) );
+/*      		int id = pl->tqmetaObject()->findSlot( TQT_SLOT(updateInit()) );
 	        if ( id != -1 )
 		{
         		kdDebug()<<"Action slot was found, it will be called now"<<endl;
-        		QUObject o[ 1 ];
+        		TQUObject o[ 1 ];
         		mod->module->qt_invoke( id, o );
 		} */
 	}
diff --git a/kate/filelistloader/katefll_initplugin.h b/kate/filelistloader/katefll_initplugin.h
index 55ac1a9..19a15d3 100644
--- a/kate/filelistloader/katefll_initplugin.h
+++ b/kate/filelistloader/katefll_initplugin.h
@@ -31,6 +31,7 @@
 class InitPluginKateFileListLoader : public Kate::InitPlugin
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
   	InitPluginKateFileListLoader (TQObject * =0, const char * =0, const TQStringList =TQStringList());
diff --git a/kate/filelistloader/katefll_plugin.cpp b/kate/filelistloader/katefll_plugin.cpp
index b10464f..0c50e6b 100644
--- a/kate/filelistloader/katefll_plugin.cpp
+++ b/kate/filelistloader/katefll_plugin.cpp
@@ -42,8 +42,8 @@ class PluginView : public KXMLGUIClient
     KRecentFilesAction *recentFiles;
 };
 
-PluginKateFileListLoader::PluginKateFileListLoader (TQObject * parent, const char *name,  const TQStringList)
-  : Plugin((Kate::Application*)parent,name), PluginViewInterface(),
+PluginKateFileListLoader::PluginKateFileListLoader (TQObject * tqparent, const char *name,  const TQStringList)
+  : Plugin((Kate::Application*)tqparent,name), PluginViewInterface(),
     m_config( new KConfig("katefilelistpluginrc") )
 {
   m_config->setGroup("General");
@@ -133,7 +133,7 @@ void PluginKateFileListLoader::removeURLFromList(const KURL& url)
 
 void PluginKateFileListLoader::slotOpenList()
 {
-  KURL url = KFileDialog::getOpenURL(TQString::null,
+  KURL url = KFileDialog::getOpenURL(TQString(),
     "*.katefl|Kate File List (*.katefl)");
   if (url.isValid()) // cancel pressed?
     slotOpenList(url);
@@ -190,7 +190,7 @@ void PluginKateFileListLoader::slotSaveList()
     {
     /*  if (m_oldInitURL!=application()->initPluginManager()->initScript())
       {
-	switch (KMessageBox::questionYesNoCancel(0,i18n("<qt>Since the last time you saved the file list, Kate has been reinitialized by another plugin other than the <B>File List Loader</B>. Do you still want to save the list to %1?</qt>").arg(m_saveURL.prettyURL()),TQString::null,KStdGuiItem::save(),KStdGuiItem::discard()))
+	switch (KMessageBox::questionYesNoCancel(0,i18n("<qt>Since the last time you saved the file list, Kate has been reinitialized by another plugin other than the <B>File List Loader</B>. Do you still want to save the list to %1?</qt>").tqarg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard()))
         {
           case KMessageBox::Yes: save(); break;
           case KMessageBox::No: slotSaveListAs(); break;
@@ -203,7 +203,7 @@ void PluginKateFileListLoader::slotSaveList()
     {
       /*if (m_saveURL!=application()->initPluginManager()->initScript())
       {
-	switch (KMessageBox::questionYesNoCancel(0,i18n("<qt>Kate has been reinitialized by another plugin other than the <B>File List Loader</B>. Do you still want to save the list to %1?</qt>").arg(m_saveURL.prettyURL()),TQString::null,KStdGuiItem::save(),KStdGuiItem::discard()))
+	switch (KMessageBox::questionYesNoCancel(0,i18n("<qt>Kate has been reinitialized by another plugin other than the <B>File List Loader</B>. Do you still want to save the list to %1?</qt>").tqarg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard()))
         {
           case KMessageBox::Yes: save(); break;
           case KMessageBox::No: slotSaveListAs(); break;
@@ -230,7 +230,7 @@ void PluginKateFileListLoader::save()
 
 void PluginKateFileListLoader::slotSaveListAs()
 {
-  KURL url=KFileDialog::getSaveURL(TQString::null,"*.katefl|Kate File List (*.katefl)");
+  KURL url=KFileDialog::getSaveURL(TQString(),"*.katefl|Kate File List (*.katefl)");
   if (url.isValid())
   {
     m_oldInitURL="";//application()->initPluginManager()->initScript();
diff --git a/kate/filelistloader/katefll_plugin.h b/kate/filelistloader/katefll_plugin.h
index e40f996..6a4553a 100644
--- a/kate/filelistloader/katefll_plugin.h
+++ b/kate/filelistloader/katefll_plugin.h
@@ -33,6 +33,7 @@
 class PluginKateFileListLoader : public Kate::Plugin, Kate::PluginViewInterface
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     PluginKateFileListLoader (TQObject * =0, const char * =0, const TQStringList =TQStringList());