summaryrefslogtreecommitdiffstats
path: root/kgeography/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:12:18 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:12:18 -0600
commitee52bb567f32fefdcf06e083c76562ea40ccf174 (patch)
tree8926667faaed3a18bec210ec14ffb9392ea8930d /kgeography/src
parent088cc453ec425bf86d610880d09645ea166a14fa (diff)
downloadtdeedu-ee52bb567f32fefdcf06e083c76562ea40ccf174.tar.gz
tdeedu-ee52bb567f32fefdcf06e083c76562ea40ccf174.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kgeography/src')
-rw-r--r--kgeography/src/boxasker.cpp2
-rw-r--r--kgeography/src/kgeography.cpp12
-rw-r--r--kgeography/src/kgeography.h10
3 files changed, 12 insertions, 12 deletions
diff --git a/kgeography/src/boxasker.cpp b/kgeography/src/boxasker.cpp
index 9fb0c90b..6bc0444a 100644
--- a/kgeography/src/boxasker.cpp
+++ b/kgeography/src/boxasker.cpp
@@ -40,7 +40,7 @@ boxAsker::boxAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count) : askWid
p_lay -> addWidget(p_label);
p_lay -> addWidget(bg, 1);
p_lay -> addWidget(p_accept);
- KAcceleratorManager::setNoAccel(this);
+ TDEAcceleratorManager::setNoAccel(this);
}
boxAsker::~boxAsker()
diff --git a/kgeography/src/kgeography.cpp b/kgeography/src/kgeography.cpp
index 3fd4ab1f..0355ba96 100644
--- a/kgeography/src/kgeography.cpp
+++ b/kgeography/src/kgeography.cpp
@@ -36,7 +36,7 @@
#include "mapparser.h"
#include "map.h"
-kgeography::kgeography() : KMainWindow(), p_firstShow(true), p_mustShowResultsDialog(false)
+kgeography::kgeography() : TDEMainWindow(), p_firstShow(true), p_mustShowResultsDialog(false)
{
p_map = 0;
p_askWidget = 0;
@@ -72,20 +72,20 @@ kgeography::kgeography() : KMainWindow(), p_firstShow(true), p_mustShowResultsDi
connect(p_askFlagDivisions, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askFlagDivisions()));
connect(p_askDivisionFlags, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askDivisionFlags()));
- KAction *a = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(openMap()), actionCollection(), "openMap");
+ TDEAction *a = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(openMap()), actionCollection(), "openMap");
a -> setText(i18n("&Open Map..."));
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "quit");
- p_zoom = new KToggleAction(i18n("&Zoom"), "viewmagfit", 0, 0, 0, actionCollection(), "zoom_select");
+ p_zoom = new TDEToggleAction(i18n("&Zoom"), "viewmagfit", 0, 0, 0, actionCollection(), "zoom_select");
p_zoom -> setEnabled(false);
- p_zoomOriginal = new KAction(i18n("&Original Size"), "viewmag1", 0, 0, 0, actionCollection(), "zoom_original");
+ p_zoomOriginal = new TDEAction(i18n("&Original Size"), "viewmag1", 0, 0, 0, actionCollection(), "zoom_original");
p_zoomOriginal -> setEnabled(false);
- p_move = new KToggleAction(i18n("&Move"), "move", 0, 0, 0, actionCollection(), "move");
+ p_move = new TDEToggleAction(i18n("&Move"), "move", 0, 0, 0, actionCollection(), "move");
p_move -> setEnabled(false);
- new KAction(i18n("Disclaimer"), 0, TQT_TQOBJECT(this), TQT_SLOT(disclaimer()), actionCollection(), "disclaimer");
+ new TDEAction(i18n("Disclaimer"), 0, TQT_TQOBJECT(this), TQT_SLOT(disclaimer()), actionCollection(), "disclaimer");
setupGUI(Keys | ToolBar | Save | Create);
diff --git a/kgeography/src/kgeography.h b/kgeography/src/kgeography.h
index 24498d04..a48c0fb5 100644
--- a/kgeography/src/kgeography.h
+++ b/kgeography/src/kgeography.h
@@ -13,9 +13,9 @@
#include <kmainwindow.h>
-class KAction;
+class TDEAction;
class KPushButton;
-class KToggleAction;
+class TDEToggleAction;
class TQHBox;
class TQLabel;
@@ -24,7 +24,7 @@ class TQVBox;
class KGmap;
class askWidget;
-class kgeography : public KMainWindow
+class kgeography : public TDEMainWindow
{
Q_OBJECT
@@ -64,8 +64,8 @@ Q_OBJECT
KPushButton *p_askMap;
KPushButton *p_askFlagDivisions;
KPushButton *p_askDivisionFlags;
- KToggleAction *p_zoom, *p_move;
- KAction *p_zoomOriginal;
+ TDEToggleAction *p_zoom, *p_move;
+ TDEAction *p_zoomOriginal;
TQLabel *p_currentMap;
KGmap *p_map;