summaryrefslogtreecommitdiffstats
path: root/blinken/src
diff options
context:
space:
mode:
Diffstat (limited to 'blinken/src')
-rw-r--r--blinken/src/Makefile.am2
-rw-r--r--blinken/src/artsplayer.cpp4
-rw-r--r--blinken/src/artsplayer.h2
-rw-r--r--blinken/src/blinken.cpp16
-rw-r--r--blinken/src/blinken.h2
-rw-r--r--blinken/src/blinkengame.cpp10
-rw-r--r--blinken/src/blinkengame.h2
-rw-r--r--blinken/src/button.cpp6
-rw-r--r--blinken/src/highscoredialog.cpp8
-rw-r--r--blinken/src/main.cpp6
10 files changed, 29 insertions, 29 deletions
diff --git a/blinken/src/Makefile.am b/blinken/src/Makefile.am
index d6a19815..2bee35a6 100644
--- a/blinken/src/Makefile.am
+++ b/blinken/src/Makefile.am
@@ -8,7 +8,7 @@ bin_PROGRAMS = blinken
INCLUDES = $(all_includes)
-blinken_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+blinken_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
blinken_LDADD = $(LIB_TDEUI) $(LIB_TDEIO) $(artslib)
blinken_SOURCES = main.cpp blinken.cpp artsplayer.cpp blinkengame.cpp number.cpp highscoredialog.cpp counter.cpp fontutils.cpp fontchecker.cpp button.cpp settings.kcfgc
diff --git a/blinken/src/artsplayer.cpp b/blinken/src/artsplayer.cpp
index a83890f9..91391e56 100644
--- a/blinken/src/artsplayer.cpp
+++ b/blinken/src/artsplayer.cpp
@@ -15,7 +15,7 @@
#include <tdelocale.h>
#include <tdemessagebox.h>
#endif
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "artsplayer.h"
#include "settings.h"
@@ -23,7 +23,7 @@
artsPlayer::artsPlayer() : m_playobj(0)
{
m_endChecker = new TQTimer(this);
- connect(m_endChecker, TQT_SIGNAL(timeout()), this, TQT_SLOT(checkEnded()));
+ connect(m_endChecker, TQ_SIGNAL(timeout()), this, TQ_SLOT(checkEnded()));
#ifndef WITHOUT_ARTS
m_dispatcher = new KArtsDispatcher;
diff --git a/blinken/src/artsplayer.h b/blinken/src/artsplayer.h
index 9fa7ece7..7bb4ed21 100644
--- a/blinken/src/artsplayer.h
+++ b/blinken/src/artsplayer.h
@@ -36,7 +36,7 @@ class TQTimer;
class artsPlayer : public TQObject
{
-Q_OBJECT
+TQ_OBJECT
public:
artsPlayer();
diff --git a/blinken/src/blinken.cpp b/blinken/src/blinken.cpp
index 4322e9b6..3b97c561 100644
--- a/blinken/src/blinken.cpp
+++ b/blinken/src/blinken.cpp
@@ -20,7 +20,7 @@
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <tdepopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "blinken.h"
#include "button.h"
@@ -65,13 +65,13 @@ blinken::blinken() : TQWidget(0, 0, WStaticContents | WNoAutoErase), m_overHighs
show();
m_unhighlighter = new TQTimer(this);
- connect(m_unhighlighter, TQT_SIGNAL(timeout()), this, TQT_SLOT(unhighlight()));
+ connect(m_unhighlighter, TQ_SIGNAL(timeout()), this, TQ_SLOT(unhighlight()));
- connect(&m_game, TQT_SIGNAL(gameEnded()), this, TQT_SLOT(checkHS()));
- connect(&m_game, TQT_SIGNAL(phaseChanged()), this, TQT_SLOT(update()));
- connect(&m_game, TQT_SIGNAL(highlight(blinkenGame::color, bool)), this, TQT_SLOT(highlight(blinkenGame::color, bool)));
+ connect(&m_game, TQ_SIGNAL(gameEnded()), this, TQ_SLOT(checkHS()));
+ connect(&m_game, TQ_SIGNAL(phaseChanged()), this, TQ_SLOT(update()));
+ connect(&m_game, TQ_SIGNAL(highlight(blinkenGame::color, bool)), this, TQ_SLOT(highlight(blinkenGame::color, bool)));
- m_helpMenu = new KHelpMenu(this, kapp->aboutData());
+ m_helpMenu = new KHelpMenu(this, tdeApp->aboutData());
for (int i = 0; i < 3; i++) m_overLevels[i] = false;
@@ -150,7 +150,7 @@ void blinken::paintEvent(TQPaintEvent *)
p.drawLine(169, 250, 469, 250);
// draw the two squares of the options
- p.setPen(TQPen(m_fontColor, 2, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin));
+ p.setPen(TQPen(m_fontColor, 2, TQt::SolidLine, TQt::SquareCap, TQt::MiterJoin));
m_soundRect = TQRect(181, 209, 25, 25);
m_fontRect = TQRect(432, 209, 25, 25);
@@ -301,7 +301,7 @@ void blinken::mousePressEvent(TQMouseEvent *e)
blinkenSettings::writeConfig();
update();
}
- else if (m_overQuit) kapp->quit();
+ else if (m_overQuit) tdeApp->quit();
else if (m_overAboutBlinken || m_overCentralLetters) m_helpMenu -> aboutApplication();
else if (m_overAboutKDE) m_helpMenu -> aboutKDE();
else if (m_overManual) m_helpMenu -> appHelpActivated();
diff --git a/blinken/src/blinken.h b/blinken/src/blinken.h
index 84fd3cfe..029288af 100644
--- a/blinken/src/blinken.h
+++ b/blinken/src/blinken.h
@@ -24,7 +24,7 @@ class highScoreDialog;
class blinken : public TQWidget
{
-Q_OBJECT
+TQ_OBJECT
public:
blinken();
diff --git a/blinken/src/blinkengame.cpp b/blinken/src/blinkengame.cpp
index 20284a69..6a5f51ae 100644
--- a/blinken/src/blinkengame.cpp
+++ b/blinken/src/blinkengame.cpp
@@ -20,7 +20,7 @@ blinkenGame::blinkenGame() : m_phase(starting)
{
m_artsPlayer = new artsPlayer;
m_waitTimer = new TQTimer(this);
- connect(m_waitTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(waiting()));
+ connect(m_waitTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(waiting()));
}
blinkenGame::~blinkenGame()
@@ -114,8 +114,8 @@ void blinkenGame::nextSound()
void blinkenGame::soundEnded()
{
- TQTimer::singleShot(100, this, TQT_SLOT(nextSound()));
- TQTimer::singleShot(50, this, TQT_SLOT(unhighlight()));
+ TQTimer::singleShot(100, this, TQ_SLOT(nextSound()));
+ TQTimer::singleShot(50, this, TQ_SLOT(unhighlight()));
}
void blinkenGame::unhighlight()
@@ -135,7 +135,7 @@ void blinkenGame::waiting()
}
else m_sequence.append(generateColor());
- connect(m_artsPlayer, TQT_SIGNAL(ended()), this, TQT_SLOT(soundEnded()));
+ connect(m_artsPlayer, TQ_SIGNAL(ended()), this, TQ_SLOT(soundEnded()));
m_nextColor = m_sequence.begin();
soundEnded();
}
@@ -156,7 +156,7 @@ blinkenGame::color blinkenGame::generateColor()
// make the compiler happy :-D
color c = none;
- r = 1 + (int)(4.0 * kapp -> random() / (RAND_MAX + 1.0));
+ r = 1 + (int)(4.0 * tdeApp -> random() / (RAND_MAX + 1.0));
switch(r)
{
case 1:
diff --git a/blinken/src/blinkengame.h b/blinken/src/blinkengame.h
index 5cee510b..561e6c7d 100644
--- a/blinken/src/blinkengame.h
+++ b/blinken/src/blinkengame.h
@@ -19,7 +19,7 @@ class artsPlayer;
class blinkenGame : public TQObject
{
-Q_OBJECT
+TQ_OBJECT
public:
blinkenGame();
diff --git a/blinken/src/button.cpp b/blinken/src/button.cpp
index 584feeb3..e36d2e19 100644
--- a/blinken/src/button.cpp
+++ b/blinken/src/button.cpp
@@ -10,14 +10,14 @@
#include <tdeaction.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include "button.h"
button::button(blinkenGame::color c) : m_selected(false), m_color(c)
{
- TDEConfig *kc = kapp->config();
+ TDEConfig *kc = tdeApp->config();
kc->setGroup("General");
TQString cs = getColorString();
TQString pixmap = TQString("images/%1h.png").arg(cs);
@@ -58,7 +58,7 @@ void button::setShortcut(int key)
m_key = key;
m_selected = false;
- TDEConfig *kc = kapp->config();
+ TDEConfig *kc = tdeApp->config();
kc->setGroup("General");
kc->writeEntry(getColorString(), key);
kc->sync();
diff --git a/blinken/src/highscoredialog.cpp b/blinken/src/highscoredialog.cpp
index 8e994f0d..f3a54835 100644
--- a/blinken/src/highscoredialog.cpp
+++ b/blinken/src/highscoredialog.cpp
@@ -130,13 +130,13 @@ highScoreDialog::highScoreDialog(TQWidget *parent) : KDialogBase(parent, 0, true
m_tw = new myTabWidget(this);
setMainWidget(m_tw);
- TDEConfig *cfg = kapp -> config();
+ TDEConfig *cfg = tdeApp -> config();
for (int i = 1; i <= 3; i++)
{
cfg -> setGroup(TQString("Level%1").arg(i));
for (int j = 1; j <= 5; j++)
{
- m_scores[i-1].append(tqMakePair(cfg->readNumEntry(TQString("Score%1").arg(j)), cfg->readEntry(TQString("Name%1").arg(j))));
+ m_scores[i-1].append(qMakePair(cfg->readNumEntry(TQString("Score%1").arg(j)), cfg->readEntry(TQString("Name%1").arg(j))));
}
}
@@ -166,10 +166,10 @@ void highScoreDialog::addScore(int level, int score, const TQString &name)
if (it != itEnd)
{
- m_scores[level].insert(it, tqMakePair(score, name));
+ m_scores[level].insert(it, qMakePair(score, name));
m_scores[level].remove(--m_scores[level].end());
- TDEConfig *cfg = kapp -> config();
+ TDEConfig *cfg = tdeApp -> config();
cfg -> setGroup(TQString("Level%1").arg(level + 1));
int j;
for (it = m_scores[level].begin(), j = 1; it != m_scores[level].end(); ++it, j++)
diff --git a/blinken/src/main.cpp b/blinken/src/main.cpp
index c013c752..3589cd58 100644
--- a/blinken/src/main.cpp
+++ b/blinken/src/main.cpp
@@ -10,8 +10,8 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
-#include <kprocess.h>
-#include <kstandarddirs.h>
+#include <tdeprocess.h>
+#include <tdestandarddirs.h>
#include "fontchecker.h"
#include "blinken.h"
@@ -24,7 +24,7 @@ int main(int argc, char *argv[])
about.addCredit("Steve Jordi", I18N_NOOP("GPL'ed his 'Steve' font so that we could use it"), "steve@sjordi.com");
TDECmdLineArgs::init(argc, argv, &about);
TDEApplication app;
- app.connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit()));
+ app.connect(&app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit()));
TQFont f("Steve", 12, TQFont::Normal, true);
if (!fontChecker::checkInstalled(f, locate("appdata", "fonts/steve.ttf")))
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-15 01:47:38 +0000