diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:20:33 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:20:33 -0600 |
commit | 41ef6ae3bd30baee1f8a40f418bc2d63a8ce5ce6 (patch) | |
tree | 63976c277d171292373b91b4f23aeb84c4712e9e /libksirtet | |
parent | 58a97ed3af5e4df6c4a58d043b0c267bd97056a9 (diff) | |
download | tdegames-41ef6ae3bd30baee1f8a40f418bc2d63a8ce5ce6.tar.gz tdegames-41ef6ae3bd30baee1f8a40f418bc2d63a8ce5ce6.zip |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'libksirtet')
-rw-r--r-- | libksirtet/base/kzoommainwindow.cpp | 2 | ||||
-rw-r--r-- | libksirtet/base/kzoommainwindow.h | 2 | ||||
-rw-r--r-- | libksirtet/base/main.cpp | 2 | ||||
-rw-r--r-- | libksirtet/common/inter.cpp | 2 | ||||
-rw-r--r-- | libksirtet/common/main.cpp | 2 | ||||
-rw-r--r-- | libksirtet/lib/keys.h | 2 | ||||
-rw-r--r-- | libksirtet/lib/mp_simple_interface.cpp | 4 |
7 files changed, 8 insertions, 8 deletions
diff --git a/libksirtet/base/kzoommainwindow.cpp b/libksirtet/base/kzoommainwindow.cpp index 3bab5661..8c3fef13 100644 --- a/libksirtet/base/kzoommainwindow.cpp +++ b/libksirtet/base/kzoommainwindow.cpp @@ -20,7 +20,7 @@ #include "kzoommainwindow.h" #include "kzoommainwindow.moc" -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <kmenubar.h> #include <kcmenumngr.h> diff --git a/libksirtet/base/kzoommainwindow.h b/libksirtet/base/kzoommainwindow.h index 3e47cb0d..a15344c8 100644 --- a/libksirtet/base/kzoommainwindow.h +++ b/libksirtet/base/kzoommainwindow.h @@ -20,7 +20,7 @@ #ifndef KZOOMMAINWINDOW_H #define KZOOMMAINWINDOW_H -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kdemacros.h> diff --git a/libksirtet/base/main.cpp b/libksirtet/base/main.cpp index 20856dcb..bda4982e 100644 --- a/libksirtet/base/main.cpp +++ b/libksirtet/base/main.cpp @@ -1,7 +1,7 @@ #include "main.h" #include "main.moc" -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <kmenubar.h> #include <kstdgameaction.h> diff --git a/libksirtet/common/inter.cpp b/libksirtet/common/inter.cpp index c5630108..312e355b 100644 --- a/libksirtet/common/inter.cpp +++ b/libksirtet/common/inter.cpp @@ -2,7 +2,7 @@ #include "inter.moc" #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include "factory.h" diff --git a/libksirtet/common/main.cpp b/libksirtet/common/main.cpp index 0b3aa414..9c4f98f4 100644 --- a/libksirtet/common/main.cpp +++ b/libksirtet/common/main.cpp @@ -2,7 +2,7 @@ #include "main.moc" #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <kkeydialog.h> #include <tdeconfigdialog.h> diff --git a/libksirtet/lib/keys.h b/libksirtet/lib/keys.h index 83b63e49..9b7ecd82 100644 --- a/libksirtet/lib/keys.h +++ b/libksirtet/lib/keys.h @@ -2,7 +2,7 @@ #define KEYS_H #include <tqmap.h> -#include <kaction.h> +#include <tdeaction.h> #include "mp_interface.h" diff --git a/libksirtet/lib/mp_simple_interface.cpp b/libksirtet/lib/mp_simple_interface.cpp index bf81d750..80dfe0eb 100644 --- a/libksirtet/lib/mp_simple_interface.cpp +++ b/libksirtet/lib/mp_simple_interface.cpp @@ -4,8 +4,8 @@ #include <kmessagebox.h> #include <tqtimer.h> #include <klocale.h> -#include <kaction.h> -#include <kmainwindow.h> +#include <tdeaction.h> +#include <tdemainwindow.h> #define PAUSE_ACTION \ |