summaryrefslogtreecommitdiffstats
path: root/kgeography/src
diff options
context:
space:
mode:
Diffstat (limited to 'kgeography/src')
-rw-r--r--kgeography/src/Makefile.am4
-rw-r--r--kgeography/src/askwidget.h2
-rw-r--r--kgeography/src/boxasker.cpp6
-rw-r--r--kgeography/src/boxasker.h2
-rw-r--r--kgeography/src/kgeography.cpp36
-rw-r--r--kgeography/src/kgeography.h2
-rw-r--r--kgeography/src/map.cpp2
-rw-r--r--kgeography/src/mapasker.cpp26
-rw-r--r--kgeography/src/mapasker.h2
-rw-r--r--kgeography/src/mapchooser.cpp8
-rw-r--r--kgeography/src/mapchooser.h2
-rw-r--r--kgeography/src/mapparser.cpp2
-rw-r--r--kgeography/src/mapwidget.cpp2
-rw-r--r--kgeography/src/mapwidget.h2
-rw-r--r--kgeography/src/mypopup.h2
-rw-r--r--kgeography/src/popupmanager.cpp2
-rw-r--r--kgeography/src/popupmanager.h2
17 files changed, 52 insertions, 52 deletions
diff --git a/kgeography/src/Makefile.am b/kgeography/src/Makefile.am
index 54a3bede..196a8020 100644
--- a/kgeography/src/Makefile.am
+++ b/kgeography/src/Makefile.am
@@ -8,7 +8,7 @@ bin_PROGRAMS = kgeography
INCLUDES = $(all_includes)
# the library search path.
-kgeography_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kgeography_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
# the libraries to link against.
kgeography_LDADD = $(LIB_TDEUI)
@@ -39,5 +39,5 @@ valgrind: kgeography
noinst_PROGRAMS = script
script_SOURCES = script.cpp
-script_LDADD = $(LIB_QT)
+script_LDADD = $(LIB_TQT)
script_LDFLAGS = $(all_libraries)
diff --git a/kgeography/src/askwidget.h b/kgeography/src/askwidget.h
index 6c3c046c..81814b17 100644
--- a/kgeography/src/askwidget.h
+++ b/kgeography/src/askwidget.h
@@ -22,7 +22,7 @@ class KGmap;
class askWidget : public TQWidget
{
-Q_OBJECT
+TQ_OBJECT
public:
askWidget(TQWidget *parent, KGmap *m, TQWidget *w, uint count, bool showLabel = true);
diff --git a/kgeography/src/boxasker.cpp b/kgeography/src/boxasker.cpp
index 7becc6c1..fa1cdb1b 100644
--- a/kgeography/src/boxasker.cpp
+++ b/kgeography/src/boxasker.cpp
@@ -33,7 +33,7 @@ boxAsker::boxAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count) : askWid
for(int i = 0; i < 4; i++)
{
p_rb[i] = new TQRadioButton(bg);
- p_rb[i]->setFocusPolicy(TQ_StrongFocus);
+ p_rb[i]->setFocusPolicy(TQWidget::StrongFocus);
}
p_accept = new KPushButton(this);
@@ -71,7 +71,7 @@ void boxAsker::nextQuestionHook(const TQString &division)
auxList << division;
// we put the division in a random place
- p_position = (int)((float)4 * kapp -> random() / (RAND_MAX + 1.0));
+ p_position = (int)((float)4 * tdeApp -> random() / (RAND_MAX + 1.0));
nextBoxAskerQuestionHook(division, p_position, true);
// we put other 3 names
@@ -122,7 +122,7 @@ void boxAsker::init()
nextQuestion();
p_accept -> disconnect();
- connect(p_accept, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAnswer()));
+ connect(p_accept, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAnswer()));
}
#include "boxasker.moc"
diff --git a/kgeography/src/boxasker.h b/kgeography/src/boxasker.h
index 0d476575..d997c24c 100644
--- a/kgeography/src/boxasker.h
+++ b/kgeography/src/boxasker.h
@@ -21,7 +21,7 @@ class TQVBoxLayout;
class boxAsker : public askWidget
{
-Q_OBJECT
+TQ_OBJECT
public:
boxAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count);
diff --git a/kgeography/src/kgeography.cpp b/kgeography/src/kgeography.cpp
index c3970a3e..a0dba217 100644
--- a/kgeography/src/kgeography.cpp
+++ b/kgeography/src/kgeography.cpp
@@ -65,16 +65,16 @@ kgeography::kgeography() : TDEMainWindow(), p_firstShow(true), p_mustShowResults
setCentralWidget(p_bigWidget);
- connect(p_consult, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(consult()));
- connect(p_askMap, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askMap()));
- connect(p_askCapitalDivisions, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askCapitalDivisions()));
- connect(p_askDivisionCapitals, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askDivisionCapitals()));
- connect(p_askFlagDivisions, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askFlagDivisions()));
- connect(p_askDivisionFlags, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askDivisionFlags()));
-
- TDEAction *a = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(openMap()), actionCollection(), "openMap");
+ connect(p_consult, TQ_SIGNAL(clicked()), this, TQ_SLOT(consult()));
+ connect(p_askMap, TQ_SIGNAL(clicked()), this, TQ_SLOT(askMap()));
+ connect(p_askCapitalDivisions, TQ_SIGNAL(clicked()), this, TQ_SLOT(askCapitalDivisions()));
+ connect(p_askDivisionCapitals, TQ_SIGNAL(clicked()), this, TQ_SLOT(askDivisionCapitals()));
+ connect(p_askFlagDivisions, TQ_SIGNAL(clicked()), this, TQ_SLOT(askFlagDivisions()));
+ connect(p_askDivisionFlags, TQ_SIGNAL(clicked()), this, TQ_SLOT(askDivisionFlags()));
+
+ TDEAction *a = KStdAction::open(this, TQ_SLOT(openMap()), actionCollection(), "openMap");
a -> setText(i18n("&Open Map..."));
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "quit");
+ KStdAction::quit(this, TQ_SLOT(close()), actionCollection(), "quit");
p_zoom = new TDEToggleAction(i18n("&Zoom"), "zoom-fit-best", 0, 0, 0, actionCollection(), "zoom_select");
p_zoom -> setEnabled(false);
@@ -85,7 +85,7 @@ kgeography::kgeography() : TDEMainWindow(), p_firstShow(true), p_mustShowResults
p_move = new TDEToggleAction(i18n("&Move"), "move", 0, 0, 0, actionCollection(), "move");
p_move -> setEnabled(false);
- new TDEAction(i18n("Disclaimer"), 0, TQT_TQOBJECT(this), TQT_SLOT(disclaimer()), actionCollection(), "disclaimer");
+ new TDEAction(i18n("Disclaimer"), 0, this, TQ_SLOT(disclaimer()), actionCollection(), "disclaimer");
setupGUI(Keys | ToolBar | Save | Create);
@@ -132,7 +132,7 @@ void kgeography::showEvent(TQShowEvent *)
}
// if anyone can explain why with the slot works and now without
// i'll be glad to learn
- TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(resizeMainWindow()));
+ TQTimer::singleShot(0, this, TQ_SLOT(resizeMainWindow()));
// resizeMainWindow();
p_firstShow = false;
@@ -269,13 +269,13 @@ void kgeography::putAskWidget()
{
p_bigWidget -> setStretchFactor(p_askWidget, 1);
p_askWidget -> show();
- connect(p_askWidget, TQT_SIGNAL(setZoomActionChecked(bool)), p_zoom, TQT_SLOT(setChecked(bool)));
- connect(p_zoom, TQT_SIGNAL(toggled(bool)), p_askWidget, TQT_SLOT(setZoom(bool)));
- connect(p_zoomOriginal, TQT_SIGNAL(activated()), p_askWidget, TQT_SLOT(setOriginalZoom()));
- connect(p_askWidget, TQT_SIGNAL(setMoveActionEnabled(bool)), p_move, TQT_SLOT(setEnabled(bool)));
- connect(p_askWidget, TQT_SIGNAL(setMoveActionChecked(bool)), p_move, TQT_SLOT(setChecked(bool)));
- connect(p_move, TQT_SIGNAL(toggled(bool)), p_askWidget, TQT_SLOT(setMovement(bool)));
- connect(p_askWidget, TQT_SIGNAL(questionsEnded()), TQT_TQOBJECT(this), TQT_SLOT(showResultsDialog()));
+ connect(p_askWidget, TQ_SIGNAL(setZoomActionChecked(bool)), p_zoom, TQ_SLOT(setChecked(bool)));
+ connect(p_zoom, TQ_SIGNAL(toggled(bool)), p_askWidget, TQ_SLOT(setZoom(bool)));
+ connect(p_zoomOriginal, TQ_SIGNAL(activated()), p_askWidget, TQ_SLOT(setOriginalZoom()));
+ connect(p_askWidget, TQ_SIGNAL(setMoveActionEnabled(bool)), p_move, TQ_SLOT(setEnabled(bool)));
+ connect(p_askWidget, TQ_SIGNAL(setMoveActionChecked(bool)), p_move, TQ_SLOT(setChecked(bool)));
+ connect(p_move, TQ_SIGNAL(toggled(bool)), p_askWidget, TQ_SLOT(setMovement(bool)));
+ connect(p_askWidget, TQ_SIGNAL(questionsEnded()), this, TQ_SLOT(showResultsDialog()));
}
void kgeography::setMap(KGmap *m)
diff --git a/kgeography/src/kgeography.h b/kgeography/src/kgeography.h
index a9343079..0a8c7be0 100644
--- a/kgeography/src/kgeography.h
+++ b/kgeography/src/kgeography.h
@@ -26,7 +26,7 @@ class askWidget;
class kgeography : public TDEMainWindow
{
-Q_OBJECT
+TQ_OBJECT
public:
kgeography();
diff --git a/kgeography/src/map.cpp b/kgeography/src/map.cpp
index 6c54db69..6dac2722 100644
--- a/kgeography/src/map.cpp
+++ b/kgeography/src/map.cpp
@@ -119,7 +119,7 @@ TQString KGmap::getName() const
TQString KGmap::getRandomDivision(bool clickDivisionMode) const
{
TQValueList<division*> aux;
- int i = (int)((float)p_nameMap.size() * kapp -> random() / (RAND_MAX + 1.0));
+ int i = (int)((float)p_nameMap.size() * tdeApp -> random() / (RAND_MAX + 1.0));
aux = p_nameMap.values();
if (!aux[i] -> canAsk(clickDivisionMode)) return getRandomDivision(clickDivisionMode);
else return aux[i] -> getName();
diff --git a/kgeography/src/mapasker.cpp b/kgeography/src/mapasker.cpp
index 12ed0f53..0422aaea 100644
--- a/kgeography/src/mapasker.cpp
+++ b/kgeography/src/mapasker.cpp
@@ -27,9 +27,9 @@ mapAsker::mapAsker(TQWidget *parent, KGmap *m, TQWidget *w, bool asker, uint cou
p_mapWidget = new mapWidget(this);
lay -> addWidget(p_mapWidget, 0, 0);
- p_hsb = new TQScrollBar(Qt::Horizontal, this);
+ p_hsb = new TQScrollBar(TQt::Horizontal, this);
lay -> addWidget(p_hsb, 1, 0);
- p_vsb = new TQScrollBar(Qt::Vertical, this);
+ p_vsb = new TQScrollBar(TQt::Vertical, this);
lay -> addWidget(p_vsb, 0, 1);
lay -> setRowStretch(2, 1);
@@ -37,17 +37,17 @@ mapAsker::mapAsker(TQWidget *parent, KGmap *m, TQWidget *w, bool asker, uint cou
p_shouldClearPopup = false;
- connect(p_mapWidget, TQT_SIGNAL(clicked(TQRgb, const TQPoint&)), this, TQT_SLOT(handleMapClick(TQRgb, const TQPoint&)));
- connect(p_mapWidget, TQT_SIGNAL(setMoveActionChecked(bool)), this, TQT_SIGNAL(setMoveActionChecked(bool)));
- connect(p_mapWidget, TQT_SIGNAL(setZoomActionChecked(bool)), this, TQT_SIGNAL(setZoomActionChecked(bool)));
- connect(p_mapWidget, TQT_SIGNAL(setMoveActionEnabled(bool)), this, TQT_SIGNAL(setMoveActionEnabled(bool)));
- connect(p_mapWidget, TQT_SIGNAL(setMoveActionEnabled(bool)), this, TQT_SLOT(showScrollBars(bool)));
- connect(p_mapWidget, TQT_SIGNAL(updatePosition(int, int)), this, TQT_SLOT(setScrollBarsPosition(int, int)));
- connect(p_mapWidget, TQT_SIGNAL(updateVisibleSize(int, int)), this, TQT_SLOT(setScrollBarsVisibleSize(int, int)));
- connect(p_mapWidget, TQT_SIGNAL(updateMaximumSize(int, int)), this, TQT_SLOT(setScrollBarsMaximumSize(int, int)));
-
- connect(p_hsb, TQT_SIGNAL(valueChanged(int)), p_mapWidget, TQT_SLOT(updateHPosition(int)));
- connect(p_vsb, TQT_SIGNAL(valueChanged(int)), p_mapWidget, TQT_SLOT(updateVPosition(int)));
+ connect(p_mapWidget, TQ_SIGNAL(clicked(TQRgb, const TQPoint&)), this, TQ_SLOT(handleMapClick(TQRgb, const TQPoint&)));
+ connect(p_mapWidget, TQ_SIGNAL(setMoveActionChecked(bool)), this, TQ_SIGNAL(setMoveActionChecked(bool)));
+ connect(p_mapWidget, TQ_SIGNAL(setZoomActionChecked(bool)), this, TQ_SIGNAL(setZoomActionChecked(bool)));
+ connect(p_mapWidget, TQ_SIGNAL(setMoveActionEnabled(bool)), this, TQ_SIGNAL(setMoveActionEnabled(bool)));
+ connect(p_mapWidget, TQ_SIGNAL(setMoveActionEnabled(bool)), this, TQ_SLOT(showScrollBars(bool)));
+ connect(p_mapWidget, TQ_SIGNAL(updatePosition(int, int)), this, TQ_SLOT(setScrollBarsPosition(int, int)));
+ connect(p_mapWidget, TQ_SIGNAL(updateVisibleSize(int, int)), this, TQ_SLOT(setScrollBarsVisibleSize(int, int)));
+ connect(p_mapWidget, TQ_SIGNAL(updateMaximumSize(int, int)), this, TQ_SLOT(setScrollBarsMaximumSize(int, int)));
+
+ connect(p_hsb, TQ_SIGNAL(valueChanged(int)), p_mapWidget, TQ_SLOT(updateHPosition(int)));
+ connect(p_vsb, TQ_SIGNAL(valueChanged(int)), p_mapWidget, TQ_SLOT(updateVPosition(int)));
if (asker)
{
diff --git a/kgeography/src/mapasker.h b/kgeography/src/mapasker.h
index e016074c..7e5a5544 100644
--- a/kgeography/src/mapasker.h
+++ b/kgeography/src/mapasker.h
@@ -24,7 +24,7 @@ class mapWidget;
class mapAsker : public askWidget
{
-Q_OBJECT
+TQ_OBJECT
public:
mapAsker(TQWidget *parent, KGmap *m, TQWidget *w, bool asker, uint count = 0);
diff --git a/kgeography/src/mapchooser.cpp b/kgeography/src/mapchooser.cpp
index 50f720d9..da852413 100644
--- a/kgeography/src/mapchooser.cpp
+++ b/kgeography/src/mapchooser.cpp
@@ -11,7 +11,7 @@
#include <tdelocale.h>
#include <tdeglobal.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqhbox.h>
#include <tqimage.h>
@@ -56,8 +56,8 @@ mapChooser::mapChooser(TQWidget *parent) : KDialogBase(parent, 0, true, i18n("Ch
p_image = new TQWidget(mapArea);
mapLay -> addWidget(p_image, 1, 1);
- connect(p_listBox, TQT_SIGNAL(highlighted(const TQString&)), this, TQT_SLOT(putImage(const TQString&)));
- connect(p_listBox, TQT_SIGNAL(selected(int)), this, TQT_SLOT(slotOk()));
+ connect(p_listBox, TQ_SIGNAL(highlighted(const TQString&)), this, TQ_SLOT(putImage(const TQString&)));
+ connect(p_listBox, TQ_SIGNAL(selected(int)), this, TQ_SLOT(slotOk()));
setMainWidget(mainHB);
@@ -85,7 +85,7 @@ void mapChooser::putImage(const TQString &mapName)
KGmap *m;
m = p_maps[mapName];
TQImage image(m -> getMapFile());
- image = image.smoothScale(300, 225, TQ_ScaleMin);
+ image = image.smoothScale(300, 225, TQImage::ScaleMin);
p_image -> setPaletteBackgroundPixmap(TQPixmap(image));
p_image -> setFixedSize(image.size());
}
diff --git a/kgeography/src/mapchooser.h b/kgeography/src/mapchooser.h
index 801f95ae..2777f55f 100644
--- a/kgeography/src/mapchooser.h
+++ b/kgeography/src/mapchooser.h
@@ -20,7 +20,7 @@
class mapChooser : public KDialogBase
{
-Q_OBJECT
+TQ_OBJECT
public:
mapChooser(TQWidget *parent);
diff --git a/kgeography/src/mapparser.cpp b/kgeography/src/mapparser.cpp
index 018bfd18..92920d45 100644
--- a/kgeography/src/mapparser.cpp
+++ b/kgeography/src/mapparser.cpp
@@ -30,7 +30,7 @@ bool mapReader::parseMap(const TQString &path)
TQFile xmlFile(path);
if (xmlFile.exists())
{
- TQXmlInputSource source(TQT_TQIODEVICE(&xmlFile));
+ TQXmlInputSource source(&xmlFile);
setContentHandler(&handler);
if (parse(source)) return true;
p_error = handler.errorString();
diff --git a/kgeography/src/mapwidget.cpp b/kgeography/src/mapwidget.cpp
index 81f55d82..d8fe9282 100644
--- a/kgeography/src/mapwidget.cpp
+++ b/kgeography/src/mapwidget.cpp
@@ -80,7 +80,7 @@ void mapWidget::updateVPosition(int value)
void mapWidget::mousePressEvent(TQMouseEvent *e)
{
- if (e -> button() == Qt::LeftButton)
+ if (e -> button() == TQt::LeftButton)
{
if (p_wantZoom)
{
diff --git a/kgeography/src/mapwidget.h b/kgeography/src/mapwidget.h
index 9ba6fe01..07f4d21e 100644
--- a/kgeography/src/mapwidget.h
+++ b/kgeography/src/mapwidget.h
@@ -17,7 +17,7 @@
class mapWidget : public TQWidget
{
-Q_OBJECT
+TQ_OBJECT
public:
mapWidget(TQWidget *parent);
diff --git a/kgeography/src/mypopup.h b/kgeography/src/mypopup.h
index b177704c..6039a513 100644
--- a/kgeography/src/mypopup.h
+++ b/kgeography/src/mypopup.h
@@ -15,7 +15,7 @@
class myPopup : public TQFrame
{
-Q_OBJECT
+TQ_OBJECT
friend class popupManager;
diff --git a/kgeography/src/popupmanager.cpp b/kgeography/src/popupmanager.cpp
index 1a457f81..5c86adeb 100644
--- a/kgeography/src/popupmanager.cpp
+++ b/kgeography/src/popupmanager.cpp
@@ -61,7 +61,7 @@ void popupManager::init(const TQPoint &p)
else y = maxY;
p_mp -> move(x, y);
p_mp -> show();
- connect(p_mp, TQT_SIGNAL(deleteMe()), this, TQT_SLOT(clear()));
+ connect(p_mp, TQ_SIGNAL(deleteMe()), this, TQ_SLOT(clear()));
}
#include "popupmanager.moc"
diff --git a/kgeography/src/popupmanager.h b/kgeography/src/popupmanager.h
index e097a31e..f6993b08 100644
--- a/kgeography/src/popupmanager.h
+++ b/kgeography/src/popupmanager.h
@@ -19,7 +19,7 @@ class myPopup;
class popupManager : public TQObject
{
-Q_OBJECT
+TQ_OBJECT
public:
popupManager(TQWidget *parent);
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-15 16:16:15 +0000