Rename a number of classes to enhance compatibility with KDE4

6 files changed, 14 insertions, 14 deletions

diff --git a/krfb/krfb/configuration.cc b/krfb/krfb/configuration.cc
index e34c1ec8..b0be2c25 100644
--- a/krfb/krfb/configuration.cc
+++ b/krfb/krfb/configuration.cc
@@ -217,7 +217,7 @@ void Configuration::saveToDialogs() {
 	while (it != invitationList.end()) {
 		Invitation &inv = *(it++);
 		if (!inv.getViewItem())
-			inv.setViewItem(new KListViewItem(invMngDlg.listView,
+			inv.setViewItem(new TDEListViewItem(invMngDlg.listView,
 				inv.creationTime().toString(Qt::LocalDate),
 				inv.expirationTime().toString(Qt::LocalDate)));
 	}
@@ -372,7 +372,7 @@ void Configuration::invMngDlgDeleteOnePressed() {
 	TQValueList<Invitation>::iterator it = invitationList.begin();
 	while (it != invitationList.end()) {
 		Invitation &ix = (*it);
-		KListViewItem *iv = ix.getViewItem();
+		TDEListViewItem *iv = ix.getViewItem();
 		if (iv && iv->isSelected())
 			it = invitationList.remove(it);
 		else
diff --git a/krfb/krfb/invitation.cc b/krfb/krfb/invitation.cc
index 480ab771..bb5ebe9d 100644
--- a/krfb/krfb/invitation.cc
+++ b/krfb/krfb/invitation.cc
@@ -114,12 +114,12 @@ bool Invitation::isValid() const {
 	return m_expirationTime > TQDateTime::currentDateTime();
 }
 
-void Invitation::setViewItem(KListViewItem *i) {
+void Invitation::setViewItem(TDEListViewItem *i) {
 	if (m_viewItem)
 		delete m_viewItem;
 	m_viewItem = i;
 }
 
-KListViewItem *Invitation::getViewItem() const{
+TDEListViewItem *Invitation::getViewItem() const{
 	return m_viewItem;
 }
diff --git a/krfb/krfb/invitation.h b/krfb/krfb/invitation.h
index 49b116ed..fd72f0fd 100644
--- a/krfb/krfb/invitation.h
+++ b/krfb/krfb/invitation.h
@@ -43,15 +43,15 @@ public:
 	TQDateTime creationTime() const;
 	bool isValid() const;
 
-	void setViewItem(KListViewItem*);
-	KListViewItem* getViewItem() const;
+	void setViewItem(TDEListViewItem*);
+	TDEListViewItem* getViewItem() const;
 	void save(TDEConfig *config, int num) const;
 private:
 	TQString m_password;
 	TQDateTime m_creationTime;
 	TQDateTime m_expirationTime;
 
-	KListViewItem *m_viewItem;
+	TDEListViewItem *m_viewItem;
 };
 
 #endif
diff --git a/krfb/krfb/manageinvitations.ui b/krfb/krfb/manageinvitations.ui
index d6cfa41b..b6c5f888 100644
--- a/krfb/krfb/manageinvitations.ui
+++ b/krfb/krfb/manageinvitations.ui
@@ -62,7 +62,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="KListView" row="0" column="0" rowspan="5" colspan="1">
+        <widget class="TDEListView" row="0" column="0" rowspan="5" colspan="1">
             <column>
                 <property name="text">
                     <string>Created</string>
diff --git a/krfb/krfb/trayicon.cpp b/krfb/krfb/trayicon.cpp
index c0cc9aa3..98824109 100644
--- a/krfb/krfb/trayicon.cpp
+++ b/krfb/krfb/trayicon.cpp
@@ -60,14 +60,14 @@ TrayIcon::TrayIcon(KDialog *d, Configuration *c) :
 	setPixmap(trayIconClosed);
 	TQToolTip::add(this, i18n("Desktop Sharing - connecting"));
 
-	manageInvitationsAction = new KAction(i18n("Manage &Invitations"), TQString(),
+	manageInvitationsAction = new TDEAction(i18n("Manage &Invitations"), TQString(),
 					      0, TQT_TQOBJECT(this), TQT_SIGNAL(showManageInvitations()),
 					      &actionCollection);
 	manageInvitationsAction->plug(contextMenu());
 
 	contextMenu()->insertSeparator();
 
-	enableControlAction = new KToggleAction(i18n("Enable Remote Control"));
+	enableControlAction = new TDEToggleAction(i18n("Enable Remote Control"));
 	enableControlAction->setCheckedState(i18n("Disable Remote Control"));
 	enableControlAction->plug(contextMenu());
 	enableControlAction->setEnabled(false);
diff --git a/krfb/krfb/trayicon.h b/krfb/krfb/trayicon.h
index 9b8c8c21..66799e6e 100644
--- a/krfb/krfb/trayicon.h
+++ b/krfb/krfb/trayicon.h
@@ -79,10 +79,10 @@ private:
   	KPixmap trayIconClosed;
 	Configuration *configuration;
 	KDialog* aboutDialog;
-	KActionCollection actionCollection;
-  	KAction* manageInvitationsAction;
-  	KAction* aboutAction;
-	KToggleAction* enableControlAction;
+	TDEActionCollection actionCollection;
+  	TDEAction* manageInvitationsAction;
+  	TDEAction* aboutAction;
+	TDEToggleAction* enableControlAction;
 	bool quitting;
 
 private slots: