Rename a number of classes to enhance compatibility with KDE4

6 files changed, 20 insertions, 20 deletions

diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp
index 994735cc..5d9d2a99 100644
--- a/kopete/protocols/winpopup/wpaccount.cpp
+++ b/kopete/protocols/winpopup/wpaccount.cpp
@@ -32,7 +32,7 @@
 // Local Includes
 #include "wpaccount.h"
 
-class KPopupMenu;
+class TDEPopupMenu;
 
 WPAccount::WPAccount(WPProtocol *parent, const TQString &accountID, const char *name)
 	: Kopete::Account(parent, accountID, name)
@@ -153,23 +153,23 @@ void WPAccount::setAway(bool status, const TQString &awayMessage)
 	myself()->setOnlineStatus(status ? mProtocol->WPAway : mProtocol->WPOnline);
 }
 
-KActionMenu* WPAccount::actionMenu()
+TDEActionMenu* WPAccount::actionMenu()
 {
 	kdDebug(14170) <<  "WPAccount::actionMenu()" << endl;
 
 	/// How to remove an action from Kopete::Account::actionMenu()? GF
 
-	KActionMenu *theActionMenu = new KActionMenu(accountId() , myself()->onlineStatus().iconFor(this), this);
+	TDEActionMenu *theActionMenu = new TDEActionMenu(accountId() , myself()->onlineStatus().iconFor(this), this);
 	theActionMenu->popupMenu()->insertTitle(myself()->onlineStatus().iconFor(this), i18n("WinPopup (%1)").arg(accountId()));
 
 	if (mProtocol)
 	{
-		KAction *goOnline = new KAction("Online", TQIconSet(mProtocol->WPOnline.iconFor(this)), 0,
+		TDEAction *goOnline = new TDEAction("Online", TQIconSet(mProtocol->WPOnline.iconFor(this)), 0,
 										 this, TQT_SLOT(connect()), theActionMenu, "actionGoAvailable");
 		goOnline->setEnabled(isConnected() && isAway());
 		theActionMenu->insert(goOnline);
 
-		KAction *goAway = new KAction("Away", TQIconSet(mProtocol->WPAway.iconFor(this)), 0,
+		TDEAction *goAway = new TDEAction("Away", TQIconSet(mProtocol->WPAway.iconFor(this)), 0,
 									  this, TQT_SLOT(goAway()), theActionMenu, "actionGoAway");
 		goAway->setEnabled(isConnected() && !isAway());
 		theActionMenu->insert(goAway);
@@ -177,7 +177,7 @@ KActionMenu* WPAccount::actionMenu()
 		/// One can not really go offline manually - appears online as long as samba server is running. GF
 
 		theActionMenu->popupMenu()->insertSeparator();
-		theActionMenu->insert(new KAction(i18n("Properties"),  0,
+		theActionMenu->insert(new TDEAction(i18n("Properties"),  0,
 							  this, TQT_SLOT(editAccount()), theActionMenu, "actionAccountProperties"));
 
 	}
diff --git a/kopete/protocols/winpopup/wpaccount.h b/kopete/protocols/winpopup/wpaccount.h
index 2eb258c3..ee237286 100644
--- a/kopete/protocols/winpopup/wpaccount.h
+++ b/kopete/protocols/winpopup/wpaccount.h
@@ -36,9 +36,9 @@
 #include "wpcontact.h"
 #include "wpaddcontact.h"
 
-class KPopupMenu;
-class KActionMenu;
-class KAction;
+class TDEPopupMenu;
+class TDEActionMenu;
+class TDEAction;
 class WPProtocol;
 class KopeteWinPopup;
 
@@ -55,7 +55,7 @@ public:
 	WPAccount(WPProtocol *parent, const TQString& accountID, const char *name = 0);
 	~WPAccount();
 
-	virtual KActionMenu* actionMenu();			// Per-protocol actions for the systray and the status bar
+	virtual TDEActionMenu* actionMenu();			// Per-protocol actions for the systray and the status bar
 	virtual void setAway(bool status, const TQString &);	// Set user away
 
 public slots:
diff --git a/kopete/protocols/winpopup/wpcontact.cpp b/kopete/protocols/winpopup/wpcontact.cpp
index 103a2a85..a7e78db0 100644
--- a/kopete/protocols/winpopup/wpcontact.cpp
+++ b/kopete/protocols/winpopup/wpcontact.cpp
@@ -55,9 +55,9 @@ WPContact::WPContact(Kopete::Account *account, const TQString &newHostName, cons
 	checkStatus.start(1000, false);
 }
 
-TQPtrList<KAction> * WPContact::customContextMenuActions()
+TQPtrList<TDEAction> * WPContact::customContextMenuActions()
 {
-	//myActionCollection = new KActionCollection(parent);
+	//myActionCollection = new TDEActionCollection(parent);
 	return 0;
 }
 
diff --git a/kopete/protocols/winpopup/wpcontact.h b/kopete/protocols/winpopup/wpcontact.h
index 73e5808e..f478c3ff 100644
--- a/kopete/protocols/winpopup/wpcontact.h
+++ b/kopete/protocols/winpopup/wpcontact.h
@@ -42,8 +42,8 @@
 class TQTimer;
 class TQListView;
 class TQListViewItem;
-class KPopupMenu;
-class KAction;
+class TDEPopupMenu;
+class TDEAction;
 namespace Kopete { class MetaContact; }
 
 class WPContact: public Kopete::Contact
@@ -56,7 +56,7 @@ public:
 
 //	virtual bool isOnline() const;
 	virtual bool isReachable();
-	virtual TQPtrList<KAction> *customContextMenuActions();
+	virtual TQPtrList<TDEAction> *customContextMenuActions();
 	virtual Kopete::ChatSession *manager(Kopete::Contact::CanCreateFlags = Kopete::Contact::CannotCreate);
 	virtual void serialize(TQMap<TQString, TQString> &serializedData, TQMap<TQString, TQString> &addressBookData);
 
@@ -74,7 +74,7 @@ private:
 	bool myWasConnected;	// true if protocol connected at last check
 
 	TQTimer checkStatus;		// checks the status of this contact every second or so
-//	KActionCollection *myActionCollection;
+//	TDEActionCollection *myActionCollection;
 							// holds all the protocol specific actions (not many!)
 	Kopete::ChatSession *m_manager;
 							// holds the two message managers - one for email and one for chat
diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp
index 1c52f2ee..0e193c39 100644
--- a/kopete/protocols/winpopup/wpprotocol.cpp
+++ b/kopete/protocols/winpopup/wpprotocol.cpp
@@ -40,7 +40,7 @@
 #include "wpaccount.h"
 #include "wpcontact.h"
 
-class KPopupMenu;
+class TDEPopupMenu;
 
 WPProtocol *WPProtocol::sProtocol = 0;
 
diff --git a/kopete/protocols/winpopup/wpprotocol.h b/kopete/protocols/winpopup/wpprotocol.h
index 7a5ef92c..20743bb4 100644
--- a/kopete/protocols/winpopup/wpprotocol.h
+++ b/kopete/protocols/winpopup/wpprotocol.h
@@ -36,9 +36,9 @@
 #include "wpaddcontact.h"
 
 namespace Kopete { class Account; }
-class KPopupMenu;
-class KActionMenu;
-class KAction;
+class TDEPopupMenu;
+class TDEActionMenu;
+class TDEAction;
 class WPContact;
 class WPAccount;