summaryrefslogtreecommitdiffstats
path: root/kmahjongg
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:20:33 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:20:33 -0600
commit41ef6ae3bd30baee1f8a40f418bc2d63a8ce5ce6 (patch)
tree63976c277d171292373b91b4f23aeb84c4712e9e /kmahjongg
parent58a97ed3af5e4df6c4a58d043b0c267bd97056a9 (diff)
downloadtdegames-41ef6ae3bd30baee1f8a40f418bc2d63a8ce5ce6.tar.gz
tdegames-41ef6ae3bd30baee1f8a40f418bc2d63a8ce5ce6.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kmahjongg')
-rw-r--r--kmahjongg/Editor.cpp2
-rw-r--r--kmahjongg/Editor.h2
-rw-r--r--kmahjongg/kmahjongg.cpp2
-rw-r--r--kmahjongg/kmahjongg.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/kmahjongg/Editor.cpp b/kmahjongg/Editor.cpp
index 3d3166ca..657f7d3b 100644
--- a/kmahjongg/Editor.cpp
+++ b/kmahjongg/Editor.cpp
@@ -11,7 +11,7 @@
#include <klocale.h> // Needed to use TDELocale
#include <kiconloader.h> //
#include <kstandarddirs.h>
-#include <ktoolbarradiogroup.h>
+#include <tdetoolbarradiogroup.h>
#define ID_TOOL_NEW 100
#define ID_TOOL_LOAD 101
diff --git a/kmahjongg/Editor.h b/kmahjongg/Editor.h
index 53537ba1..b772f2ae 100644
--- a/kmahjongg/Editor.h
+++ b/kmahjongg/Editor.h
@@ -3,7 +3,7 @@
#include <tqdialog.h>
#include <tqframe.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
#include <kstatusbar.h>
#include <tdefiledialog.h>
diff --git a/kmahjongg/kmahjongg.cpp b/kmahjongg/kmahjongg.cpp
index a55c7769..54b9716f 100644
--- a/kmahjongg/kmahjongg.cpp
+++ b/kmahjongg/kmahjongg.cpp
@@ -28,7 +28,7 @@
#include <limits.h>
#include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <tdeconfigdialog.h>
#include <kinputdialog.h>
#include <kmenubar.h>
diff --git a/kmahjongg/kmahjongg.h b/kmahjongg/kmahjongg.h
index 7a0f5839..a3cb237b 100644
--- a/kmahjongg/kmahjongg.h
+++ b/kmahjongg/kmahjongg.h
@@ -28,7 +28,7 @@
#ifndef _KMAHJONGG_H
#define _KMAHJONGG_H
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include "KmTypes.h"
#include "Tileset.h"