Rename a number of classes to enhance compatibility with KDE4

1 files changed, 8 insertions, 8 deletions

diff --git a/kontact/src/mainwindow.h b/kontact/src/mainwindow.h
index e9ddc121f..57df05c07 100644
--- a/kontact/src/mainwindow.h
+++ b/kontact/src/mainwindow.h
@@ -42,7 +42,7 @@ class TQSplitter;
 class TQVBox;
 class TQFrame;
 
-class KAction;
+class TDEAction;
 class TDEConfig;
 class KPluginInfo;
 class KRSqueezedTextLabel;
@@ -62,7 +62,7 @@ class IconSidePane;
 class Plugin;
 
 typedef TQValueList<Kontact::Plugin*> PluginList;
-typedef TQPtrList<KAction> ActionPluginList;
+typedef TQPtrList<TDEAction> ActionPluginList;
 
 class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public KontactIface
 {
@@ -117,9 +117,9 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont
 
     void sortActionsByWeight();
     bool isPluginLoaded( const KPluginInfo * );
-    bool isPluginLoadedByAction( const KAction *action );
+    bool isPluginLoadedByAction( const TDEAction *action );
     Kontact::Plugin *pluginFromInfo( const KPluginInfo * );
-    Kontact::Plugin *pluginFromAction( const KAction * );
+    Kontact::Plugin *pluginFromAction( const TDEAction * );
     void loadPlugins();
     void unloadPlugins();
     void updateShortcuts();
@@ -133,7 +133,7 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont
     virtual void saveProperties( TDEConfig *config );
     void paintAboutScreen( const TQString& msg );
     static TQString introductionString();
-    KToolBar* findToolBar(const char* name);
+    TDEToolBar* findToolBar(const char* name);
 
   private slots:
     void pluginsChanged();
@@ -146,8 +146,8 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont
 
     TQSplitter *mSplitter;
 
-    KToolBarPopupAction *mNewActions;
-    KToolBarPopupAction *mSyncActions;
+    TDEToolBarPopupAction *mNewActions;
+    TDEToolBarPopupAction *mSyncActions;
     IconSidePane *mSidePane;
     TQWidgetStack *mPartsStack;
     Plugin *mCurrentPlugin;
@@ -164,7 +164,7 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont
     TQString mActiveModule;
 
     TQMap<TQString, TQGuardedPtr<TQWidget> > mFocusWidgets;
-    TQMap<Kontact::Plugin *, KAction *> mPluginAction;
+    TQMap<Kontact::Plugin *, TDEAction *> mPluginAction;
 
     AboutDialog *mAboutDialog;
     bool mReallyClose;