diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 01:03:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 01:03:32 -0600 |
| commit | 1a4615a891172a58eff43f5ef0cd150b67798f4e (patch) | |
| tree | 10cb98b2e3578be42f305684bb404c4eb8247ae2 /kmahjongg | |
| parent | 891c539927a94a67f8c8482b10f95af8dea8b63f (diff) | |
| download | tdegames-1a4615a891172a58eff43f5ef0cd150b67798f4e.tar.gz tdegames-1a4615a891172a58eff43f5ef0cd150b67798f4e.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kmahjongg')
| -rw-r--r-- | kmahjongg/Editor.h | 2 | ||||
| -rw-r--r-- | kmahjongg/Preview.cpp | 2 | ||||
| -rw-r--r-- | kmahjongg/boardwidget.cpp | 2 | ||||
| -rw-r--r-- | kmahjongg/kmahjongg.cpp | 4 | ||||
| -rw-r--r-- | kmahjongg/prefs.kcfgc | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/kmahjongg/Editor.h b/kmahjongg/Editor.h index 1b1b09de..61634ae4 100644 --- a/kmahjongg/Editor.h +++ b/kmahjongg/Editor.h @@ -5,7 +5,7 @@ #include <tqframe.h> #include <ktoolbar.h> #include <kstatusbar.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include "Tileset.h" #include "BoardLayout.h" diff --git a/kmahjongg/Preview.cpp b/kmahjongg/Preview.cpp index 9c6ac478..0f6af54b 100644 --- a/kmahjongg/Preview.cpp +++ b/kmahjongg/Preview.cpp @@ -1,5 +1,5 @@ #include <kapplication.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kmessagebox.h> #include <kpushbutton.h> diff --git a/kmahjongg/boardwidget.cpp b/kmahjongg/boardwidget.cpp index 3e4c1033..ec4ff595 100644 --- a/kmahjongg/boardwidget.cpp +++ b/kmahjongg/boardwidget.cpp @@ -8,7 +8,7 @@ #include <klocale.h> #include <kstandarddirs.h> #include <tqfile.h> -#include <kconfig.h> +#include <tdeconfig.h> /** * Constructor. diff --git a/kmahjongg/kmahjongg.cpp b/kmahjongg/kmahjongg.cpp index ff825b31..6a63abc4 100644 --- a/kmahjongg/kmahjongg.cpp +++ b/kmahjongg/kmahjongg.cpp @@ -29,13 +29,13 @@ #include <kaboutdata.h> #include <kaction.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <kinputdialog.h> #include <kmenubar.h> #include <kmessagebox.h> #include <kstdgameaction.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include "prefs.h" #include "kmahjongg.h" diff --git a/kmahjongg/prefs.kcfgc b/kmahjongg/prefs.kcfgc index 1498936f..2cd4110d 100644 --- a/kmahjongg/prefs.kcfgc +++ b/kmahjongg/prefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kmahjongg.kcfg #IncludeFiles=defines.h ClassName=Prefs |