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

---
 kmahjongg/boardwidget.cpp | 2 +-
 kmahjongg/kmahjongg.cpp   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'kmahjongg')

diff --git a/kmahjongg/boardwidget.cpp b/kmahjongg/boardwidget.cpp
index 23d183ab..3e4c1033 100644
--- a/kmahjongg/boardwidget.cpp
+++ b/kmahjongg/boardwidget.cpp
@@ -87,7 +87,7 @@ void BoardWidget::loadSettings(){
 
 void BoardWidget::saveSettings(){
   // Preview can't handle this.  TODO
-  //KConfig *config=kapp->config();
+  //TDEConfig *config=kapp->config();
   //config->setGroup("General");
 
   //config->writePathEntry("Tileset_file", tileFile);
diff --git a/kmahjongg/kmahjongg.cpp b/kmahjongg/kmahjongg.cpp
index 7d33ab80..ff825b31 100644
--- a/kmahjongg/kmahjongg.cpp
+++ b/kmahjongg/kmahjongg.cpp
@@ -233,10 +233,10 @@ void KMahjongg::redo()
  * Show Configure dialog.
  */
 void KMahjongg::showSettings(){
-  if(KConfigDialog::showDialog("settings"))
+  if(TDEConfigDialog::showDialog("settings"))
     return;
 
-  KConfigDialog *dialog = new KConfigDialog(this, "settings", Prefs::self(), KDialogBase::Swallow);
+  TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Prefs::self(), KDialogBase::Swallow);
   dialog->addPage(new Settings(0, "General"), i18n("General"), "package_settings");
   connect(dialog, TQT_SIGNAL(settingsChanged()), bw, TQT_SLOT(loadSettings()));
   connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(setDisplayedWidth()));
@@ -466,7 +466,7 @@ void KMahjongg::loadGame() {
     if ( url.isEmpty() )
 	return;
 
-    KIO::NetAccess::download( url, fname, this );
+    TDEIO::NetAccess::download( url, fname, this );
 
     // open the file for reading
     FILE *outFile = fopen( TQFile::encodeName(fname), "r");
@@ -496,7 +496,7 @@ void KMahjongg::loadGame() {
     // close the file before exit
     fclose(outFile);
 
-    KIO::NetAccess::removeTempFile( fname );
+    TDEIO::NetAccess::removeTempFile( fname );
 
     // refresh the board
     bw->gameLoaded();
-- 
cgit v1.2.1