summaryrefslogtreecommitdiffstats
path: root/kmahjongg
diff options
context:
space:
mode:
Diffstat (limited to 'kmahjongg')
-rw-r--r--kmahjongg/Editor.cpp4
-rw-r--r--kmahjongg/HighScore.cpp4
-rw-r--r--kmahjongg/Preview.cpp4
-rw-r--r--kmahjongg/boardwidget.cpp14
4 files changed, 13 insertions, 13 deletions
diff --git a/kmahjongg/Editor.cpp b/kmahjongg/Editor.cpp
index ca964cc8..7e816114 100644
--- a/kmahjongg/Editor.cpp
+++ b/kmahjongg/Editor.cpp
@@ -10,7 +10,7 @@
#include <tdemessagebox.h>
#include <tdelocale.h> // Needed to use TDELocale
#include <kiconloader.h> //
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetoolbarradiogroup.h>
#define ID_TOOL_NEW 100
@@ -82,7 +82,7 @@ Editor::Editor
tiles.loadTileset(tile);
// tell the user what we do
- setCaption(kapp->makeStdCaption(i18n("Edit Board Layout")));
+ setCaption(tdeApp->makeStdCaption(i18n("Edit Board Layout")));
connect( drawFrame, TQ_SIGNAL(mousePressed(TQMouseEvent *) ),
diff --git a/kmahjongg/HighScore.cpp b/kmahjongg/HighScore.cpp
index acd1e5ba..6c92e434 100644
--- a/kmahjongg/HighScore.cpp
+++ b/kmahjongg/HighScore.cpp
@@ -7,7 +7,7 @@
#include <tqfileinfo.h>
#include <tdemessagebox.h>
#include "tdelocale.h"
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kiconloader.h>
#include <tqlineedit.h>
#include <tqcombobox.h>
@@ -159,7 +159,7 @@ HighScore::HighScore
loadTables();
currTable = tables;
- setCaption(kapp->makeStdCaption(i18n("Scores")));
+ setCaption(tdeApp->makeStdCaption(i18n("Scores")));
selectedLine = -1;
diff --git a/kmahjongg/Preview.cpp b/kmahjongg/Preview.cpp
index cfc87b5a..0db5b6cc 100644
--- a/kmahjongg/Preview.cpp
+++ b/kmahjongg/Preview.cpp
@@ -3,7 +3,7 @@
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <kpushbutton.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kstdguiitem.h>
#include <kimageio.h>
@@ -125,7 +125,7 @@ void Preview::initialise(const PreviewType type)
// we start with no change indicated
markUnchanged();
- m_fileList = kapp->dirs()->findAllResources("appdata", "pics/*"+extension, false, true);
+ m_fileList = tdeApp->dirs()->findAllResources("appdata", "pics/*"+extension, false, true);
// get rid of files from the last invocation
m_combo->clear();
diff --git a/kmahjongg/boardwidget.cpp b/kmahjongg/boardwidget.cpp
index dd75e9b0..063dd163 100644
--- a/kmahjongg/boardwidget.cpp
+++ b/kmahjongg/boardwidget.cpp
@@ -6,7 +6,7 @@
#include <tqtimer.h>
#include <tqpainter.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqfile.h>
#include <tdeconfig.h>
@@ -46,7 +46,7 @@ BoardWidget::BoardWidget( TQWidget* parent, const char *name )
KMessageBox::error(this,
i18n("An error occurred when loading the tileset file %1\n"
"KMahjongg will now terminate.").arg(tFile));
- kapp->quit();
+ tdeApp->quit();
}
getFileOrDefault(Prefs::background(), "bgnd", tFile);
@@ -57,7 +57,7 @@ BoardWidget::BoardWidget( TQWidget* parent, const char *name )
KMessageBox::error(this,
i18n("An error occurred when loading the background image\n%1").arg(tFile)+
i18n("KMahjongg will now terminate."));
- kapp->quit();
+ tdeApp->quit();
}
getFileOrDefault(Prefs::layout(), "layout", tFile);
@@ -66,7 +66,7 @@ BoardWidget::BoardWidget( TQWidget* parent, const char *name )
KMessageBox::error(this,
i18n("An error occurred when loading the board layout %1\n"
"KMahjongg will now terminate.").arg(tFile));
- kapp->quit();
+ tdeApp->quit();
}
setDisplayedWidth();
loadSettings();
@@ -87,7 +87,7 @@ void BoardWidget::loadSettings(){
void BoardWidget::saveSettings(){
// Preview can't handle this. TODO
- //TDEConfig *config=kapp->config();
+ //TDEConfig *config=tdeApp->config();
//config->setGroup("General");
//config->writePathEntry("Tileset_file", tileFile);
@@ -112,7 +112,7 @@ void BoardWidget::getFileOrDefault(TQString filename, TQString type, TQString &r
KMessageBox::error(this, i18n("KMahjongg could not locate the file: %1\n"
"or the default file of type: %2\n"
"KMahjongg will now terminate").arg(filename).arg(type) );
- kapp->quit();
+ tdeApp->quit();
}
}
@@ -733,7 +733,7 @@ void BoardWidget::calculateNewGame( int gNumber)
}
if (gNumber == -1) {
- gameGenerationNum = kapp->random();
+ gameGenerationNum = tdeApp->random();
} else {
gameGenerationNum = gNumber;
}