summaryrefslogtreecommitdiffstats
path: root/twin4/twin4
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:03:32 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:03:32 -0600
commit1a4615a891172a58eff43f5ef0cd150b67798f4e (patch)
tree10cb98b2e3578be42f305684bb404c4eb8247ae2 /twin4/twin4
parent891c539927a94a67f8c8482b10f95af8dea8b63f (diff)
downloadtdegames-1a4615a891172a58eff43f5ef0cd150b67798f4e.tar.gz
tdegames-1a4615a891172a58eff43f5ef0cd150b67798f4e.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'twin4/twin4')
-rw-r--r--twin4/twin4/kspritecache.cpp10
-rw-r--r--twin4/twin4/prefs.kcfgc2
-rw-r--r--twin4/twin4/twin4.cpp6
-rw-r--r--twin4/twin4/twin4doc.cpp2
-rw-r--r--twin4/twin4/twin4player.cpp2
-rw-r--r--twin4/twin4/twin4view.cpp2
6 files changed, 12 insertions, 12 deletions
diff --git a/twin4/twin4/kspritecache.cpp b/twin4/twin4/kspritecache.cpp
index 046893cf..7068c90b 100644
--- a/twin4/twin4/kspritecache.cpp
+++ b/twin4/twin4/kspritecache.cpp
@@ -17,7 +17,7 @@
#include "kspritecache.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <tqbitmap.h>
#include <tqimage.h>
#include <tqwmatrix.h>
@@ -221,7 +221,7 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(TDEConfig *config,TQString
//kdDebug(11002) << " Reading " << number << " frames " << endl;
TQString pixfile=config->readPathEntry(name+"file");
- TQString maskfile=config->readPathEntry(name+"mask");
+ TQString mastdefile=config->readPathEntry(name+"mask");
// Load a given set of images or replace a %d by a sequence if there are
// less image names than number given
@@ -232,7 +232,7 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(TDEConfig *config,TQString
{
TQString tmpfile,tmpmask;
tmpfile.sprintf(pixfile.latin1(),i);
- tmpmask.sprintf(maskfile.latin1(),i);
+ tmpmask.sprintf(mastdefile.latin1(),i);
pixmap=loadPixmap(tmpfile,tmpmask);
if (!pixmap) kdError() << "Could not create pixmap="<<tmpfile << " with mask " << tmpmask << endl;
@@ -255,9 +255,9 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(TDEConfig *config,TQString
double step;
if (number>1) step=(100.0-finalscale)/100.0/(double)(number-1);
else step=1.0;
- //kdDebug(11002) << " Scaling " << number << " pics axis="<<axis<<" final="<<finalscale<<" file="<<pixfile<< " mask="<<maskfile<<endl;
+ //kdDebug(11002) << " Scaling " << number << " pics axis="<<axis<<" final="<<finalscale<<" file="<<pixfile<< " mask="<<mastdefile<<endl;
- pixmap=loadPixmap(pixfile,maskfile);
+ pixmap=loadPixmap(pixfile,mastdefile);
for (unsigned int j=0;j<(unsigned int)number;j++)
{
TQWMatrix matrix;
diff --git a/twin4/twin4/prefs.kcfgc b/twin4/twin4/prefs.kcfgc
index ad918c2a..1f27291e 100644
--- a/twin4/twin4/prefs.kcfgc
+++ b/twin4/twin4/prefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
File=twin4.kcfg
#IncludeFiles=defines.h
ClassName=Prefs
diff --git a/twin4/twin4/twin4.cpp b/twin4/twin4/twin4.cpp
index b21847a2..f3a4df26 100644
--- a/twin4/twin4/twin4.cpp
+++ b/twin4/twin4/twin4.cpp
@@ -28,16 +28,16 @@
#include <kapplication.h>
#include <kstdgameaction.h>
#include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <klocale.h>
#include <khelpmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <kstdaction.h>
#include <kaction.h>
#include <tqpushbutton.h>
#include <kstatusbar.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
#include <kchatdialog.h>
#include <kgamechat.h>
diff --git a/twin4/twin4/twin4doc.cpp b/twin4/twin4/twin4doc.cpp
index 2fd408bb..672c6501 100644
--- a/twin4/twin4/twin4doc.cpp
+++ b/twin4/twin4/twin4doc.cpp
@@ -23,7 +23,7 @@
// include files for TDE
#include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <krandomsequence.h>
diff --git a/twin4/twin4/twin4player.cpp b/twin4/twin4/twin4player.cpp
index bbed450c..47014f10 100644
--- a/twin4/twin4/twin4player.cpp
+++ b/twin4/twin4/twin4player.cpp
@@ -18,7 +18,7 @@
// include files for TDE
#include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kgamepropertyhandler.h>
#include "twin4player.h"
diff --git a/twin4/twin4/twin4view.cpp b/twin4/twin4/twin4view.cpp
index 277dc71c..81441368 100644
--- a/twin4/twin4/twin4view.cpp
+++ b/twin4/twin4/twin4view.cpp
@@ -20,7 +20,7 @@
#include <stdio.h>
#include <math.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klocale.h>
#include <kapplication.h>
#include <kstandarddirs.h>