From 2f84d0e2d3d4252e6aee24aceafa45dbdb7f4d1d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:32:59 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 kbattleship/kbattleship/kbattleship.cpp   |  2 +-
 kbattleship/kbattleship/kbattleship.h     |  4 ++--
 kbattleship/kbattleship/kclientdialog.h   |  2 +-
 kbattleship/kbattleship/kserverdialog.cpp | 12 ++++++------
 kbattleship/kbattleship/kserverdialog.h   |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'kbattleship')

diff --git a/kbattleship/kbattleship/kbattleship.cpp b/kbattleship/kbattleship/kbattleship.cpp
index d488f125..a1aee315 100644
--- a/kbattleship/kbattleship/kbattleship.cpp
+++ b/kbattleship/kbattleship/kbattleship.cpp
@@ -805,7 +805,7 @@ void KBattleshipWindow::slotNewServer()
 
 		slotStatusMsg(i18n("Loading Start-Server dialog..."));
 
-		m_server = new KServerDialog(this);
+		m_server = new TDEServerDialog(this);
 		connect(m_server, TQT_SIGNAL(okClicked()), TQT_TQOBJECT(this), TQT_SLOT(slotStartBattleshipServer()));
 		connect(m_server, TQT_SIGNAL(cancelClicked()), TQT_TQOBJECT(this), TQT_SLOT(slotDeleteServerDialog()));
 		m_server->show();
diff --git a/kbattleship/kbattleship/kbattleship.h b/kbattleship/kbattleship/kbattleship.h
index 470f3831..2f4e3b89 100644
--- a/kbattleship/kbattleship/kbattleship.h
+++ b/kbattleship/kbattleship/kbattleship.h
@@ -137,7 +137,7 @@ private:
 	TQString m_enemyClientDescription;
 	TQString m_enemyProtocolVersion;
 
-	KConfig *m_config;
+	TDEConfig *m_config;
 	KBAIPlayer *m_aiPlayer;
 	KonnectionHandling *m_connection;
 	KBattleshipServer *m_kbserver;
@@ -153,7 +153,7 @@ private:
 	KToggleAction *m_configSound;
 	KToggleAction *m_configGrid;
 	KClientDialog *m_client;
-	KServerDialog *m_server;
+	TDEServerDialog *m_server;
 	KShipList *m_ownshiplist;
 	KShipList *m_enemyshiplist;
 	TQString m_ownNickname;
diff --git a/kbattleship/kbattleship/kclientdialog.h b/kbattleship/kbattleship/kclientdialog.h
index b18a6f5b..3af24d38 100644
--- a/kbattleship/kbattleship/kclientdialog.h
+++ b/kbattleship/kbattleship/kclientdialog.h
@@ -54,7 +54,7 @@ signals:
 	void sigCancelConnect();
 
 private:
-	KConfig *m_config;
+	TDEConfig *m_config;
 	DNSSD::ServiceBrowser *m_browser;
 	clientConnectDlg *m_mainWidget;
 };
diff --git a/kbattleship/kbattleship/kserverdialog.cpp b/kbattleship/kbattleship/kserverdialog.cpp
index d8fa1b1d..1a045cc6 100644
--- a/kbattleship/kbattleship/kserverdialog.cpp
+++ b/kbattleship/kbattleship/kserverdialog.cpp
@@ -21,7 +21,7 @@
 
 #include "kserverdialog.h"
 
-KServerDialog::KServerDialog(TQWidget *parent, const char *name) : 
+TDEServerDialog::TDEServerDialog(TQWidget *parent, const char *name) : 
 	KDialogBase(Plain, i18n("Start Server"), Ok|Cancel, Ok, parent, name, true, false, KGuiItem(i18n("&Start")))
 {
 	TQFrame* page = plainPage();
@@ -37,29 +37,29 @@ KServerDialog::KServerDialog(TQWidget *parent, const char *name) :
 	m_mainWidget->gamenameEdit->setText(gamename);
 }
 
-void KServerDialog::slotOk()
+void TDEServerDialog::slotOk()
 {
 	hide();
 	emit okClicked();
 }
 
-void KServerDialog::slotCancel()
+void TDEServerDialog::slotCancel()
 {
 	hide();
 	emit cancelClicked();
 }
 
-TQString KServerDialog::port() const
+TQString TDEServerDialog::port() const
 {
 	return TQString::number(m_mainWidget->portEdit->value());
 }
 
-TQString KServerDialog::nickname() const
+TQString TDEServerDialog::nickname() const
 {
 	return m_mainWidget->nicknameEdit->text();
 }
 
-TQString KServerDialog::gamename() const
+TQString TDEServerDialog::gamename() const
 {
 	return m_mainWidget->gamenameEdit->text();
 }
diff --git a/kbattleship/kbattleship/kserverdialog.h b/kbattleship/kbattleship/kserverdialog.h
index 704f7afa..90fca2d7 100644
--- a/kbattleship/kbattleship/kserverdialog.h
+++ b/kbattleship/kbattleship/kserverdialog.h
@@ -28,12 +28,12 @@
 #include "dialogs/serverDlg.h"
 
 
-class KServerDialog : public KDialogBase
+class TDEServerDialog : public KDialogBase
 {
 	Q_OBJECT
   
 public:
-	KServerDialog(TQWidget *parent = 0, const char *name = 0);
+	TDEServerDialog(TQWidget *parent = 0, const char *name = 0);
 
 	TQString port() const;
 	TQString nickname() const;
-- 
cgit v1.2.1