summaryrefslogtreecommitdiffstats
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
parent088cc453ec425bf86d610880d09645ea166a14fa (diff)
downloadtdeedu-ee52bb567f32fefdcf06e083c76562ea40ccf174.tar.gz
tdeedu-ee52bb567f32fefdcf06e083c76562ea40ccf174.zip
Rename a number of classes to enhance compatibility with KDE4
-rw-r--r--blinken/src/blinken.cpp2
-rw-r--r--blinken/src/blinken.h2
-rw-r--r--blinken/src/button.cpp2
-rw-r--r--blinken/src/button.h6
-rw-r--r--kalzium/src/detailinfodlg.cpp2
-rw-r--r--kalzium/src/detailinfodlg.h4
-rw-r--r--kalzium/src/elementdataviewer.cpp2
-rw-r--r--kalzium/src/elementdataviewer.h4
-rw-r--r--kalzium/src/kalzium.cpp30
-rw-r--r--kalzium/src/kalzium.h36
-rw-r--r--kalzium/src/molcalcwidget.h2
-rw-r--r--kbruch/ChangeLog2
-rw-r--r--kbruch/src/mainqtwidget.cpp4
-rw-r--r--kbruch/src/mainqtwidget.h4
-rw-r--r--kbruch/src/taskvieweroptionsbase.ui2
-rw-r--r--keduca/keduca/kcheckeduca.cpp2
-rw-r--r--keduca/keduca/keduca.cpp2
-rw-r--r--keduca/keduca/keduca.h2
-rw-r--r--keduca/keduca/keduca_part.h2
-rw-r--r--keduca/keduca/kgroupeduca.cpp4
-rw-r--r--keduca/keduca/kradioeduca.cpp8
-rw-r--r--keduca/keduca/kradioeduca.h6
-rw-r--r--keduca/keducabuilder/kcontroladdeditbase.ui2
-rw-r--r--keduca/keducabuilder/keducabuilder.cpp18
-rw-r--r--keduca/keducabuilder/keducabuilder.h6
-rw-r--r--kgeography/src/boxasker.cpp2
-rw-r--r--kgeography/src/kgeography.cpp12
-rw-r--r--kgeography/src/kgeography.h10
-rw-r--r--khangman/khangman/khangman.cpp16
-rw-r--r--khangman/khangman/khangman.h14
-rw-r--r--kig/ChangeLog2
-rw-r--r--kig/filters/drgeo-filter-chooserbase.ui2
-rw-r--r--kig/filters/exporter.cc14
-rw-r--r--kig/filters/exporter.h4
-rw-r--r--kig/kig/kig.cpp2
-rw-r--r--kig/kig/kig.h10
-rw-r--r--kig/kig/kig_part.cpp38
-rw-r--r--kig/kig/kig_part.h50
-rw-r--r--kig/misc/guiaction.cc2
-rw-r--r--kig/misc/guiaction.h2
-rw-r--r--kig/modes/popup.cc4
-rw-r--r--kig/modes/popup.h4
-rw-r--r--kig/modes/typesdialog.cpp4
-rw-r--r--kig/modes/typesdialogbase.ui2
-rw-r--r--kig/scripting/newscriptwizard.cc16
-rw-r--r--kiten/configdictionaries.cpp8
-rw-r--r--kiten/configdictionaries.h4
-rw-r--r--kiten/configdictionariesbase.ui4
-rw-r--r--kiten/configfont.ui2
-rw-r--r--kiten/kiten.cpp36
-rw-r--r--kiten/kiten.h24
-rw-r--r--kiten/learn.cpp20
-rw-r--r--kiten/learn.h32
-rw-r--r--kiten/optiondialog.h4
-rw-r--r--kiten/rad.cpp4
-rw-r--r--kiten/rad.h6
-rw-r--r--kiten/widgets.cpp24
-rw-r--r--kiten/widgets.h14
-rw-r--r--klatin/klatin/klatin.cpp10
-rw-r--r--klatin/klatin/klatin.h10
-rw-r--r--klettres/ChangeLog2
-rw-r--r--klettres/klettres/fontsdlg.ui2
-rw-r--r--klettres/klettres/klettres.cpp26
-rw-r--r--klettres/klettres/klettres.h26
-rw-r--r--kmplot/kmplot/FktDlgData.ui2
-rw-r--r--kmplot/kmplot/MainDlg.cpp70
-rw-r--r--kmplot/kmplot/MainDlg.h12
-rw-r--r--kmplot/kmplot/View.cpp2
-rw-r--r--kmplot/kmplot/View.h6
-rw-r--r--kmplot/kmplot/kmplot.h4
-rw-r--r--kmplot/kmplot/ksliderwindow.cpp6
-rw-r--r--kmplot/kmplot/ksliderwindow.h2
-rw-r--r--kmplot/kmplot/qconstanteditor.ui2
-rw-r--r--kmplot/kmplot/qminmax.ui2
-rw-r--r--kmplot/kmplot/qparametereditor.ui2
-rw-r--r--kmplot/kmplot/settingspagefonts.ui4
-rw-r--r--kstars/kstars/addcatdialogui.ui2
-rw-r--r--kstars/kstars/details_database.ui2
-rw-r--r--kstars/kstars/details_links.ui4
-rw-r--r--kstars/kstars/devmanager.ui4
-rw-r--r--kstars/kstars/draglistbox.cpp2
-rw-r--r--kstars/kstars/draglistbox.h4
-rw-r--r--kstars/kstars/fitsheaderdialog.ui2
-rw-r--r--kstars/kstars/fitsviewer.cpp20
-rw-r--r--kstars/kstars/fitsviewer.h2
-rw-r--r--kstars/kstars/fovdialogui.ui2
-rw-r--r--kstars/kstars/imageviewer.cpp6
-rw-r--r--kstars/kstars/imageviewer.h4
-rw-r--r--kstars/kstars/indidevice.h2
-rw-r--r--kstars/kstars/indidriver.cpp8
-rw-r--r--kstars/kstars/indidriver.h10
-rw-r--r--kstars/kstars/indiproperty.h4
-rw-r--r--kstars/kstars/indistd.cpp2
-rw-r--r--kstars/kstars/kspopupmenu.cpp4
-rw-r--r--kstars/kstars/kspopupmenu.h2
-rw-r--r--kstars/kstars/kstars.cpp38
-rw-r--r--kstars/kstars/kstars.h10
-rw-r--r--kstars/kstars/kstarsactions.cpp6
-rw-r--r--kstars/kstars/kstarsinit.cpp126
-rw-r--r--kstars/kstars/kswizardui.ui2
-rw-r--r--kstars/kstars/opscolorsui.ui4
-rw-r--r--kstars/kstars/telescopepropui.ui2
-rw-r--r--kstars/kstars/thumbnailpickerui.ui2
-rw-r--r--kstars/kstars/toggleaction.cpp4
-rw-r--r--kstars/kstars/toggleaction.h2
-rw-r--r--kstars/kstars/tools/altvstimeui.ui2
-rw-r--r--kstars/kstars/tools/argloadcolorscheme.ui2
-rw-r--r--kstars/kstars/tools/lcgenerator.cpp4
-rw-r--r--kstars/kstars/tools/lcgenerator.h6
-rw-r--r--kstars/kstars/tools/observinglist.cpp2
-rw-r--r--kstars/kstars/tools/observinglistui.ui4
-rw-r--r--kstars/kstars/tools/obslistwizardui.ui6
-rw-r--r--kstars/kstars/tools/optionstreeview.ui2
-rw-r--r--kstars/kstars/tools/scriptbuilder.cpp2
-rw-r--r--kstars/kstars/tools/scriptbuilderui.ui4
-rw-r--r--kstars/kstars/tools/wutdialogui.ui4
-rw-r--r--ktouch/ChangeLog2
-rw-r--r--ktouch/src/ktouch.cpp24
-rw-r--r--ktouch/src/ktouch.h18
-rw-r--r--ktouch/src/ktouchkeyboardeditor.cpp2
-rw-r--r--ktouch/src/ktouchlectureeditor.cpp2
-rw-r--r--ktouch/src/ktouchlectureeditor_dlg.ui2
-rw-r--r--ktouch/src/ktouchprefgenerallayout.ui2
-rw-r--r--ktouch/src/ktouchprefkeyboardlayout.ui2
-rw-r--r--kturtle/src/kturtle.cpp60
-rw-r--r--kturtle/src/kturtle.h24
-rw-r--r--kverbos/kverbos/kverbos.cpp18
-rw-r--r--kverbos/kverbos/kverbos.h50
-rw-r--r--kverbos/kverbos/kverbosdoc.h2
-rw-r--r--kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui4
-rw-r--r--kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp2
-rw-r--r--kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h6
-rw-r--r--kvoctrain/kvoctrain/kva_init.cpp42
-rw-r--r--kvoctrain/kvoctrain/kvoctrain.h78
-rw-r--r--kvoctrain/kvoctrain/main.cpp2
-rw-r--r--kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp2
-rw-r--r--kwordquiz/src/flashview.h10
-rw-r--r--kwordquiz/src/kwordquiz.cpp100
-rw-r--r--kwordquiz/src/kwordquiz.h128
-rw-r--r--kwordquiz/src/kwordquizdoc.h2
-rw-r--r--kwordquiz/src/prefcardappearancebase.ui4
-rw-r--r--kwordquiz/src/qaview.h8
-rw-r--r--libtdeedu/extdate/extdatepicker.cpp2
-rw-r--r--libtdeedu/extdate/extdatetbl.cpp20
-rw-r--r--libtdeedu/extdate/extdatetbl.h12
-rw-r--r--libtdeedu/extdate/testwidget.cpp2
-rw-r--r--libtdeedu/extdate/testwidget.h2
-rw-r--r--libtdeedu/tdeeduui/tdeeduglossary.cpp4
-rw-r--r--libtdeedu/tdeeduui/tdeeduglossary.h12
149 files changed, 854 insertions, 854 deletions
diff --git a/blinken/src/blinken.cpp b/blinken/src/blinken.cpp
index 54d45532..5e00cd64 100644
--- a/blinken/src/blinken.cpp
+++ b/blinken/src/blinken.cpp
@@ -234,7 +234,7 @@ void blinken::keyPressEvent(TQKeyEvent *e)
}
else
{
- KShortcut ks(e -> key());
+ TDEShortcut ks(e -> key());
if (!ks.toString().isEmpty())
{
bool different = true;
diff --git a/blinken/src/blinken.h b/blinken/src/blinken.h
index 8f3241be..84fd3cfe 100644
--- a/blinken/src/blinken.h
+++ b/blinken/src/blinken.h
@@ -16,7 +16,7 @@
class TQTimer;
-class KAction;
+class TDEAction;
class KHelpMenu;
class button;
diff --git a/blinken/src/button.cpp b/blinken/src/button.cpp
index 16d5d91e..0bcc845a 100644
--- a/blinken/src/button.cpp
+++ b/blinken/src/button.cpp
@@ -66,7 +66,7 @@ void button::setShortcut(int key)
TQString button::shortcut() const
{
- return KShortcut(m_key).toString();
+ return TDEShortcut(m_key).toString();
}
int button::key() const
diff --git a/blinken/src/button.h b/blinken/src/button.h
index d267b5b1..6137c55c 100644
--- a/blinken/src/button.h
+++ b/blinken/src/button.h
@@ -14,9 +14,9 @@
#include "blinkengame.h"
-class KAction;
-class KActionCollection;
-class KShortcut;
+class TDEAction;
+class TDEActionCollection;
+class TDEShortcut;
class button
{
diff --git a/kalzium/src/detailinfodlg.cpp b/kalzium/src/detailinfodlg.cpp
index 698ca829..2d15a89d 100644
--- a/kalzium/src/detailinfodlg.cpp
+++ b/kalzium/src/detailinfodlg.cpp
@@ -65,7 +65,7 @@ DetailedInfoDlg::DetailedInfoDlg( Element *el , TQWidget *parent, const char *na
// setting the element
createContent();
- m_actionCollection = new KActionCollection(this);
+ m_actionCollection = new TDEActionCollection(this);
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), m_actionCollection);
setButtonTip( User2, i18n( "Goes to the previous element" ) );
diff --git a/kalzium/src/detailinfodlg.h b/kalzium/src/detailinfodlg.h
index d2027f8b..18494746 100644
--- a/kalzium/src/detailinfodlg.h
+++ b/kalzium/src/detailinfodlg.h
@@ -29,7 +29,7 @@ class TQMouseEvent;
class TQFrame;
class TQLabel;
class TQVBoxLayout;
-class KActionCollection;
+class TDEActionCollection;
class TDEHTMLPart;
/**
@@ -57,7 +57,7 @@ class DetailedInfoDlg : public KDialogBase
Element *m_element;
int m_elementNumber;
- KActionCollection* m_actionCollection;
+ TDEActionCollection* m_actionCollection;
SpectrumViewImpl *m_spectrumview;
diff --git a/kalzium/src/elementdataviewer.cpp b/kalzium/src/elementdataviewer.cpp
index 376f136b..5f3dba55 100644
--- a/kalzium/src/elementdataviewer.cpp
+++ b/kalzium/src/elementdataviewer.cpp
@@ -68,7 +68,7 @@ ElementDataViewer::ElementDataViewer( TQWidget *parent, const char* name )
setButtonText( User1, i18n("&Plot") );
- m_actionCollection = new KActionCollection(this);
+ m_actionCollection = new TDEActionCollection(this);
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), m_actionCollection);
connect ( m_pPlotSetupWidget->KCB_y, TQT_SIGNAL( activated(int) ),
diff --git a/kalzium/src/elementdataviewer.h b/kalzium/src/elementdataviewer.h
index 74ffb17f..0b73b582 100644
--- a/kalzium/src/elementdataviewer.h
+++ b/kalzium/src/elementdataviewer.h
@@ -22,7 +22,7 @@ class Element;
class KalziumDataObject;
class PlotSetupWidget;
class PlotWidget;
-class KActionCollection;
+class TDEActionCollection;
/**
* @short the values of the y-Axis
@@ -135,7 +135,7 @@ class ElementDataViewer : public KDialogBase
TQStringList names;
- KActionCollection* m_actionCollection;
+ TDEActionCollection* m_actionCollection;
void initData();
void setupAxisData();
diff --git a/kalzium/src/kalzium.cpp b/kalzium/src/kalzium.cpp
index 17e8a953..bc266e5e 100644
--- a/kalzium/src/kalzium.cpp
+++ b/kalzium/src/kalzium.cpp
@@ -56,7 +56,7 @@
#define IDS_ELEMENTINFO 7
Kalzium::Kalzium()
- : KMainWindow( 0, "Kalzium" )
+ : TDEMainWindow( 0, "Kalzium" )
{
// reading the elements from file
KalziumDataObject::instance();
@@ -107,14 +107,14 @@ Kalzium::Kalzium()
void Kalzium::setupActions()
{
- m_actionNoScheme = new KToggleAction(i18n("&No Color Scheme"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotNoLook()), actionCollection(), "view_look_noscheme");
+ m_actionNoScheme = new TDEToggleAction(i18n("&No Color Scheme"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotNoLook()), actionCollection(), "view_look_noscheme");
// the actions for the color schemes
- m_actionGroups = new KToggleAction(i18n("Show &Groups"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookGroups()), actionCollection(), "view_look_groups");
- m_actionBlocks = new KToggleAction(i18n("Show &Blocks"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookBlocks()), actionCollection(), "view_look_blocks");
- m_actionAcid = new KToggleAction(i18n("Show &Acid Behavior"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookAcidBehavior()), actionCollection(), "view_look_acid");
- m_actionFamily = new KToggleAction(i18n("Show &Family"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookFamily()), actionCollection(), "view_look_family");
- m_actionCrystal = new KToggleAction(i18n("Show &Crystal Structures"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookCrystal()), actionCollection(), "view_look_crystal");
+ m_actionGroups = new TDEToggleAction(i18n("Show &Groups"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookGroups()), actionCollection(), "view_look_groups");
+ m_actionBlocks = new TDEToggleAction(i18n("Show &Blocks"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookBlocks()), actionCollection(), "view_look_blocks");
+ m_actionAcid = new TDEToggleAction(i18n("Show &Acid Behavior"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookAcidBehavior()), actionCollection(), "view_look_acid");
+ m_actionFamily = new TDEToggleAction(i18n("Show &Family"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookFamily()), actionCollection(), "view_look_family");
+ m_actionCrystal = new TDEToggleAction(i18n("Show &Crystal Structures"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookCrystal()), actionCollection(), "view_look_crystal");
//the actions for switching PerodicTableView
TQStringList gradientlist;
@@ -127,7 +127,7 @@ void Kalzium::setupActions()
gradientlist.append(i18n("Melting Point"));
gradientlist.append(i18n("Electronegativity"));
gradientlist.append(i18n("Electron Affinity"));
- gradient_action = new KSelectAction(i18n("&Gradient"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "view_look_gradmenu");
+ gradient_action = new TDESelectAction(i18n("&Gradient"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "view_look_gradmenu");
gradient_action->setItems(gradientlist);
connect (gradient_action, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSwitchtoGradient(int)));
@@ -137,24 +137,24 @@ void Kalzium::setupActions()
numlist.append(i18n("Show &IUPAC"));
numlist.append(i18n("Show &CAS"));
numlist.append(i18n("Show &Old IUPAC"));
- numeration_action = new KSelectAction (i18n("&Numeration"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "view_numerationtype");
+ numeration_action = new TDESelectAction (i18n("&Numeration"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "view_numerationtype");
numeration_action->setItems(numlist);
numeration_action->setCurrentItem(Prefs::numeration());
connect (numeration_action, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSwitchtoNumeration(int)));
- m_SidebarAction = new KAction(i18n("Show &Sidebar"), "sidebar", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowHideSidebar()), actionCollection(), "view_sidebar");
+ m_SidebarAction = new TDEAction(i18n("Show &Sidebar"), "sidebar", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowHideSidebar()), actionCollection(), "view_sidebar");
#ifdef HAVE_FACILE
- m_EQSolverAction = new KAction(i18n("&Equation Solver..."), "eqchem", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowEQSolver()), actionCollection(), "tools_eqsolver");
+ m_EQSolverAction = new TDEAction(i18n("&Equation Solver..."), "eqchem", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowEQSolver()), actionCollection(), "tools_eqsolver");
#endif
// tools actions
- m_pPlotAction = new KAction(i18n("&Plot Data..."), "plot", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPlotData()), actionCollection(), "tools_plotdata");
- m_pGlossaryAction = new KAction(i18n("&Glossary..."), "glossary", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGlossary()), actionCollection(), "tools_glossary");
+ m_pPlotAction = new TDEAction(i18n("&Plot Data..."), "plot", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPlotData()), actionCollection(), "tools_plotdata");
+ m_pGlossaryAction = new TDEAction(i18n("&Glossary..."), "glossary", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGlossary()), actionCollection(), "tools_glossary");
// other period view options
- m_pLegendAction = new KAction(i18n("Show &Legend"), "legend", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowLegend()), actionCollection(), "view_legend");
- m_pTooltipAction = new KAction(i18n("Show &Tooltip"), "tooltip", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEnableTooltips()), actionCollection(), "view_tooltip");
+ m_pLegendAction = new TDEAction(i18n("Show &Legend"), "legend", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowLegend()), actionCollection(), "view_legend");
+ m_pTooltipAction = new TDEAction(i18n("Show &Tooltip"), "tooltip", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEnableTooltips()), actionCollection(), "view_tooltip");
// the standard actions
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showSettingsDialog()), actionCollection());
diff --git a/kalzium/src/kalzium.h b/kalzium/src/kalzium.h
index b7a03973..41faf36a 100644
--- a/kalzium/src/kalzium.h
+++ b/kalzium/src/kalzium.h
@@ -19,8 +19,8 @@
#include <kmainwindow.h>
-class KSelectAction;
-class KToggleAction;
+class TDESelectAction;
+class TDEToggleAction;
class QuizsettingsDlg;
class SliderWidget;
class TQToolBox;
@@ -43,7 +43,7 @@ class GlossaryDialog;
* This class connects the parts of kalzium. All actions will
* be set, the menu generated and so on.
*/
-class Kalzium : public KMainWindow
+class Kalzium : public TDEMainWindow
{
Q_OBJECT
@@ -86,24 +86,24 @@ class Kalzium : public KMainWindow
void setFullDraw();
/**
- * all KActions Kalzium uses
+ * all TDEActions Kalzium uses
*/
- KSelectAction *gradient_action;
- KSelectAction *numeration_action;
- KAction *m_pPlotAction,
+ TDESelectAction *gradient_action;
+ TDESelectAction *numeration_action;
+ TDEAction *m_pPlotAction,
*m_pGlossaryAction;
- KAction *m_pTooltipAction;
- KAction *m_pLegendAction;
- KAction *m_SidebarAction;
- KAction *m_EQSolverAction;
-
- KToggleAction *m_actionNoScheme;
- KToggleAction *m_actionGroups;
- KToggleAction *m_actionBlocks;
- KToggleAction *m_actionAcid;
- KToggleAction *m_actionFamily;
- KToggleAction *m_actionCrystal;
+ TDEAction *m_pTooltipAction;
+ TDEAction *m_pLegendAction;
+ TDEAction *m_SidebarAction;
+ TDEAction *m_EQSolverAction;
+
+ TDEToggleAction *m_actionNoScheme;
+ TDEToggleAction *m_actionGroups;
+ TDEToggleAction *m_actionBlocks;
+ TDEToggleAction *m_actionAcid;
+ TDEToggleAction *m_actionFamily;
+ TDEToggleAction *m_actionCrystal;
/**
* the layout of the central Widget ( CentralWidget )
diff --git a/kalzium/src/molcalcwidget.h b/kalzium/src/molcalcwidget.h
index 171433a0..9314eb4f 100644
--- a/kalzium/src/molcalcwidget.h
+++ b/kalzium/src/molcalcwidget.h
@@ -24,7 +24,7 @@
#include "moleculeparser.h"
-class KToggleAction;
+class TDEToggleAction;
class KLineEdit;
class Element;
diff --git a/kbruch/ChangeLog b/kbruch/ChangeLog
index 688ef69f..8b9729c6 100644
--- a/kbruch/ChangeLog
+++ b/kbruch/ChangeLog
@@ -36,7 +36,7 @@
* added program icon
- * added KHelpMenu as KPopupMenu to the help button in the main window
+ * added KHelpMenu as TDEPopupMenu to the help button in the main window
* added section main window to the handbook
diff --git a/kbruch/src/mainqtwidget.cpp b/kbruch/src/mainqtwidget.cpp
index e6d35fb0..096bc467 100644
--- a/kbruch/src/mainqtwidget.cpp
+++ b/kbruch/src/mainqtwidget.cpp
@@ -55,7 +55,7 @@ MainQtWidget::MainQtWidget()
// get the settings
readOptions();
- // creating KActions, used by the kbruchui.rc file
+ // creating TDEActions, used by the kbruchui.rc file
setupActions();
createGUI(0L);
@@ -154,7 +154,7 @@ void MainQtWidget::writeOptions()
void MainQtWidget::setupActions()
{
// new task action
- m_NewTaskAction = new KAction(i18n("&New"), "filenew", KStdAccel::shortcut(KStdAccel::New),
+ m_NewTaskAction = new TDEAction(i18n("&New"), "filenew", TDEStdAccel::shortcut(TDEStdAccel::New),
TQT_TQOBJECT(this), TQT_SLOT(NewTask()),
actionCollection(), "NewTask");
diff --git a/kbruch/src/mainqtwidget.h b/kbruch/src/mainqtwidget.h
index 3f0f6f08..1868d9c6 100644
--- a/kbruch/src/mainqtwidget.h
+++ b/kbruch/src/mainqtwidget.h
@@ -37,7 +37,7 @@ class TaskView;
* \author Sebastian Stein
* \author Eva Brucherseifer
**/
-class MainQtWidget : public KMainWindow
+class MainQtWidget : public TDEMainWindow
{
Q_OBJECT
@@ -100,7 +100,7 @@ class MainQtWidget : public KMainWindow
KWidgetAction * m_OperationBoxAction;
KWidgetAction * m_OperationLabelAction;
- KAction * m_NewTaskAction;
+ TDEAction * m_NewTaskAction;
private slots:
/**
diff --git a/kbruch/src/taskvieweroptionsbase.ui b/kbruch/src/taskvieweroptionsbase.ui
index 66f45d15..72f2077a 100644
--- a/kbruch/src/taskvieweroptionsbase.ui
+++ b/kbruch/src/taskvieweroptionsbase.ui
@@ -24,7 +24,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KFontChooser">
+ <widget class="TDEFontChooser">
<property name="name">
<cstring>kcfg_taskFont</cstring>
</property>
diff --git a/keduca/keduca/kcheckeduca.cpp b/keduca/keduca/kcheckeduca.cpp
index 5a9a60dc..eae53cd5 100644
--- a/keduca/keduca/kcheckeduca.cpp
+++ b/keduca/keduca/kcheckeduca.cpp
@@ -24,7 +24,7 @@
KCheckEduca::KCheckEduca(TQWidget *parent, const char *name ) : TQCheckBox(parent,name)
{
_doc = 0;
- KAcceleratorManager::setNoAccel( this );
+ TDEAcceleratorManager::setNoAccel( this );
}
KCheckEduca::~KCheckEduca()
diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp
index 9092eb00..c79beadc 100644
--- a/keduca/keduca/keduca.cpp
+++ b/keduca/keduca/keduca.cpp
@@ -64,7 +64,7 @@ Keduca::~Keduca()
void Keduca::setupActions()
{
KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ), actionCollection() );
- (void)new KAction( i18n( "Open &Gallery..." ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotGallery() ),
+ (void)new TDEAction( i18n( "Open &Gallery..." ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotGallery() ),
actionCollection(), "open_gallery" );
_recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT ( slotFileOpenURL(const KURL &) ),
actionCollection());
diff --git a/keduca/keduca/keduca.h b/keduca/keduca/keduca.h
index f4899a4c..736dc712 100644
--- a/keduca/keduca/keduca.h
+++ b/keduca/keduca/keduca.h
@@ -57,7 +57,7 @@ private:
// Private attributes
/** Recent files */
- KRecentFilesAction *_recentFiles;
+ TDERecentFilesAction *_recentFiles;
/** A KEDUCA file main view */
KParts::ReadOnlyPart *_part;
diff --git a/keduca/keduca/keduca_part.h b/keduca/keduca/keduca_part.h
index 69d88fdf..e165f52e 100644
--- a/keduca/keduca/keduca_part.h
+++ b/keduca/keduca/keduca_part.h
@@ -75,7 +75,7 @@ class KEducaPart : public KParts::ReadOnlyPart
private:
/*
- * Sets the KActions for this part.
+ * Sets the TDEActions for this part.
*/
void setupActions();
diff --git a/keduca/keduca/kgroupeduca.cpp b/keduca/keduca/kgroupeduca.cpp
index 9f7a2413..ec77868f 100644
--- a/keduca/keduca/kgroupeduca.cpp
+++ b/keduca/keduca/kgroupeduca.cpp
@@ -48,7 +48,7 @@ void KGroupEduca::insertAnswer( const TQString& text)
switch( _typeMode )
{
case Radio:
- answer = new KRadioEduca( _vbox2 );
+ answer = new TDERadioEduca( _vbox2 );
break;
case Check:
answer = new KCheckEduca( _vbox2 );
@@ -87,7 +87,7 @@ bool KGroupEduca::isChecked(int id)
{
case Radio:
{
- KRadioEduca *tmpRadioButton = (KRadioEduca*) find(id);
+ TDERadioEduca *tmpRadioButton = (TDERadioEduca*) find(id);
if(tmpRadioButton != 0) return tmpRadioButton->isChecked();
}
break;
diff --git a/keduca/keduca/kradioeduca.cpp b/keduca/keduca/kradioeduca.cpp
index 96792e24..b858cb6d 100644
--- a/keduca/keduca/kradioeduca.cpp
+++ b/keduca/keduca/kradioeduca.cpp
@@ -20,19 +20,19 @@
#include <tqstyle.h>
#include <kaccelmanager.h>
-KRadioEduca::KRadioEduca(TQWidget *parent, const char *name) : TQRadioButton(parent,name)
+TDERadioEduca::TDERadioEduca(TQWidget *parent, const char *name) : TQRadioButton(parent,name)
{
_doc=0;
- KAcceleratorManager::setNoAccel(this);
+ TDEAcceleratorManager::setNoAccel(this);
}
-KRadioEduca::~KRadioEduca()
+TDERadioEduca::~TDERadioEduca()
{
delete _doc;
}
/** reimpl */
-void KRadioEduca::drawButtonLabel( TQPainter *p)
+void TDERadioEduca::drawButtonLabel( TQPainter *p)
{
int x, y, w, h;
int extra_width, indicator_width;
diff --git a/keduca/keduca/kradioeduca.h b/keduca/keduca/kradioeduca.h
index c42f372f..1056ff53 100644
--- a/keduca/keduca/kradioeduca.h
+++ b/keduca/keduca/kradioeduca.h
@@ -25,13 +25,13 @@
/**TQRadioButton with wordwrap and richtext features
*@author Javier Campos Morales
*/
-class KRadioEduca : public TQRadioButton {
+class TDERadioEduca : public TQRadioButton {
Q_OBJECT
public:
- KRadioEduca(TQWidget *parent=0, const char *name=0);
- ~KRadioEduca();
+ TDERadioEduca(TQWidget *parent=0, const char *name=0);
+ ~TDERadioEduca();
protected:
diff --git a/keduca/keducabuilder/kcontroladdeditbase.ui b/keduca/keducabuilder/kcontroladdeditbase.ui
index c5736e3d..e0902db1 100644
--- a/keduca/keducabuilder/kcontroladdeditbase.ui
+++ b/keduca/keducabuilder/kcontroladdeditbase.ui
@@ -636,7 +636,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListView">
+ <widget class="TDEListView">
<column>
<property name="text">
<string>Answer</string>
diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp
index 3f498c51..77ece602 100644
--- a/keduca/keducabuilder/keducabuilder.cpp
+++ b/keduca/keducabuilder/keducabuilder.cpp
@@ -61,7 +61,7 @@ static const char* const keducabuilder_data[] = {
"..............."};
KEducaBuilder::KEducaBuilder(TQWidget* parent, const char *name, WFlags f )
- : KMainWindow(parent,name,f),
+ : TDEMainWindow(parent,name,f),
_nativeFormat("application/x-edu")
{
_keducaFile = new FileRead();
@@ -90,7 +90,7 @@ void KEducaBuilder::init()
_split = new TQSplitter( mainView );
_split->setOrientation( Qt::Vertical );
- _listAnswer = new KListBox( _split, "_listAnswer" );
+ _listAnswer = new TDEListBox( _split, "_listAnswer" );
_listAnswer->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, _listAnswer->sizePolicy().hasHeightForWidth() ) );
connect( _listAnswer, TQT_SIGNAL( highlighted(TQListBoxItem *) ), TQT_TQOBJECT(this), TQT_SLOT( slotPreview(TQListBoxItem *) ) );
connect( _listAnswer, TQT_SIGNAL( doubleClicked(TQListBoxItem *) ), TQT_TQOBJECT(this), TQT_SLOT( slotEditbyList(TQListBoxItem *) ) );
@@ -113,19 +113,19 @@ void KEducaBuilder::initMenuBar()
{
KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT( slotFileOpenNew() ), actionCollection());
KStdAction::open (TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ), actionCollection());
- (void)new KAction(i18n("Open &Gallery..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotGallery() ), actionCollection(), "open_gallery");
+ (void)new TDEAction(i18n("Open &Gallery..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotGallery() ), actionCollection(), "open_gallery");
_recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT ( slotFileOpenURL(const KURL &)), actionCollection());
KStdAction::save (TQT_TQOBJECT(this), TQT_SLOT( slotFileSave() ), actionCollection());
KStdAction::saveAs (TQT_TQOBJECT(this), TQT_SLOT( slotFileSaveAs() ), actionCollection());
KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT( slotFilePrint() ), actionCollection());
- (void)new KAction(i18n("Document Info"), "info", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHeader() ), actionCollection(), "info_doc");
+ (void)new TDEAction(i18n("Document Info"), "info", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHeader() ), actionCollection(), "info_doc");
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection());
- (void)new KAction(i18n("&Add..."), "addquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAdd() ), actionCollection(), "question_add");
- (void)new KAction(i18n("&Edit..."), "editquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotEdit() ), actionCollection(), "question_edit");
- (void)new KAction(i18n("&Remove"), "delquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemove() ), actionCollection(), "question_remove");
- (void)new KAction(i18n("&Up"), "up", 0, TQT_TQOBJECT(this), TQT_SLOT( slotUp() ), actionCollection(), "question_up");
- (void)new KAction(i18n("&Down"), "down", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDown() ), actionCollection(), "question_down");
+ (void)new TDEAction(i18n("&Add..."), "addquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAdd() ), actionCollection(), "question_add");
+ (void)new TDEAction(i18n("&Edit..."), "editquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotEdit() ), actionCollection(), "question_edit");
+ (void)new TDEAction(i18n("&Remove"), "delquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemove() ), actionCollection(), "question_remove");
+ (void)new TDEAction(i18n("&Up"), "up", 0, TQT_TQOBJECT(this), TQT_SLOT( slotUp() ), actionCollection(), "question_up");
+ (void)new TDEAction(i18n("&Down"), "down", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDown() ), actionCollection(), "question_down");
}
/** Delete current document and start new */
diff --git a/keduca/keducabuilder/keducabuilder.h b/keduca/keducabuilder/keducabuilder.h
index d030013d..d91efb79 100644
--- a/keduca/keducabuilder/keducabuilder.h
+++ b/keduca/keducabuilder/keducabuilder.h
@@ -34,7 +34,7 @@
*@author Javier Campos
*/
-class KEducaBuilder : public KMainWindow {
+class KEducaBuilder : public TDEMainWindow {
Q_OBJECT
@@ -76,9 +76,9 @@ private:
/** KEDUCA file */
FileRead *_keducaFile;
/** Recent files */
- KRecentFilesAction *_recentFiles;
+ TDERecentFilesAction *_recentFiles;
/** List of answers */
- KListBox *_listAnswer;
+ TDEListBox *_listAnswer;
/** Preview */
TQTextView *_preview;
/** Main splitter */
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;
diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp
index 4b8075a6..61b04c85 100644
--- a/khangman/khangman/khangman.cpp
+++ b/khangman/khangman/khangman.cpp
@@ -45,7 +45,7 @@
KHangMan::KHangMan()
- : KMainWindow( 0, "KHangMan" ),
+ : TDEMainWindow( 0, "KHangMan" ),
m_view(new KHangManView(this))
{
m_newStuff = 0;
@@ -57,7 +57,7 @@ KHangMan::KHangMan()
// Toolbar for special characters
secondToolbar = toolBar("secondToolBar");
- secondToolbar->setBarPos(KToolBar::Bottom);
+ secondToolbar->setBarPos(TDEToolBar::Bottom);
loadSettings();
setAccent();
loadLangToolBar();
@@ -74,21 +74,21 @@ KHangMan::~KHangMan()
void KHangMan::setupActions()
{
// Game->New
- KAction *action = new KAction(i18n("&New"), "filenew", CTRL+Key_N , TQT_TQOBJECT(m_view), TQT_SLOT(slotNewGame()), actionCollection(), "file_new");
+ TDEAction *action = new TDEAction(i18n("&New"), "filenew", CTRL+Key_N , TQT_TQOBJECT(m_view), TQT_SLOT(slotNewGame()), actionCollection(), "file_new");
action->setToolTip(i18n( "Play with a new word" ));
// Game->Get Words in New Language
- new KAction( i18n("&Get Words in New Language..."), "knewstuff", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" );
+ new TDEAction( i18n("&Get Words in New Language..."), "knewstuff", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" );
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection());
- m_levelAction = new KSelectAction(i18n("Le&vel"), 0, actionCollection(), "combo_level");
+ m_levelAction = new TDESelectAction(i18n("Le&vel"), 0, actionCollection(), "combo_level");
m_levelAction->setToolTip(i18n( "Choose the level" ));
m_levelAction->setWhatsThis(i18n( "Choose the level of difficulty" ));
connect(m_levelAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeLevel(int)));
// Action for selecting language.
- m_languageAction = new KSelectAction(i18n("&Language"), 0, actionCollection(), "languages");
+ m_languageAction = new TDESelectAction(i18n("&Language"), 0, actionCollection(), "languages");
m_languageAction->setItems(m_languageNames);
m_languageAction->setCurrentItem(m_languages.findIndex(Prefs::selectedLanguage()));
connect(m_languageAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeLanguage(int)));
@@ -97,7 +97,7 @@ void KHangMan::setupActions()
// Mode. Currently hard coded into Sea and Desert themes.
TQStringList modes;
- m_modeAction = new KSelectAction(i18n("L&ook"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChangeMode()), actionCollection(), "combo_mode");
+ m_modeAction = new TDESelectAction(i18n("L&ook"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChangeMode()), actionCollection(), "combo_mode");
modes += i18n("&Sea Theme");
modes += i18n("&Desert Theme");
m_modeAction->setItems(modes);
@@ -473,7 +473,7 @@ void KHangMan::loadLangToolBar()
void KHangMan::slotPasteChar()
{
- KToolBarButton *charBut = (KToolBarButton* ) sender();
+ TDEToolBarButton *charBut = (TDEToolBarButton* ) sender();
m_view->enterLetter(m_allData[charBut->id()]);
}
diff --git a/khangman/khangman/khangman.h b/khangman/khangman/khangman.h
index 7dd21980..9fddf835 100644
--- a/khangman/khangman/khangman.h
+++ b/khangman/khangman/khangman.h
@@ -30,8 +30,8 @@
#include "khangmanview.h"
-class KSelectAction;
-class KToggleAction;
+class TDESelectAction;
+class TDEToggleAction;
class KHNewStuff;
class advanced;
@@ -48,7 +48,7 @@ const int IDS_HINT = 103;
* @author Anne-Marie Mahfouf <annemarie.mahfouf@free.fr>
* @version 0.1
*/
-class KHangMan : public KMainWindow
+class KHangMan : public TDEMainWindow
{
Q_OBJECT
@@ -71,7 +71,7 @@ public:
void changeStatusbar(const TQString& text, int id);
///Action that sets up the Language menu
- KSelectAction *m_languageAction;
+ TDESelectAction *m_languageAction;
///Method to set the current language into the Statusbar and to pass it to KHangManView
void setLanguages();
@@ -146,11 +146,11 @@ private:
KHNewStuff *m_newStuff;
// Actions in the Game menu
- KSelectAction *m_levelAction;
- KSelectAction *m_modeAction;
+ TDESelectAction *m_levelAction;
+ TDESelectAction *m_modeAction;
///Create the Special Characters Toolbar
- KToolBar *secondToolbar;
+ TDEToolBar *secondToolbar;
// True if the language has no special chars, such as en, it and nl.
// FIXME: Reverse the bool. Negated bools are difficult to read.
diff --git a/kig/ChangeLog b/kig/ChangeLog
index 48a0a4e5..ddbb1309 100644
--- a/kig/ChangeLog
+++ b/kig/ChangeLog
@@ -666,7 +666,7 @@
* Clean the status bar text on time in ConstructMode and
TestConstructMode.
- * Make SetCoordinateSystemAction into a KSelectAction, so the user
+ * Make SetCoordinateSystemAction into a TDESelectAction, so the user
can see what kind of coordinate system he's currently using.
* Some tuning of the UI: move Transformations and Tests menu into
diff --git a/kig/filters/drgeo-filter-chooserbase.ui b/kig/filters/drgeo-filter-chooserbase.ui
index 2473fd12..d173a46e 100644
--- a/kig/filters/drgeo-filter-chooserbase.ui
+++ b/kig/filters/drgeo-filter-chooserbase.ui
@@ -51,7 +51,7 @@ Please select which to import:</string>
<property name="spacing">
<number>6</number>
</property>
- <widget class="KListBox">
+ <widget class="TDEListBox">
<property name="name">
<cstring>FigureListBox</cstring>
</property>
diff --git a/kig/filters/exporter.cc b/kig/filters/exporter.cc
index 77ce7266..005342de 100644
--- a/kig/filters/exporter.cc
+++ b/kig/filters/exporter.cc
@@ -58,20 +58,20 @@ static bool operator<( const TQColor& a, const TQColor& b )
}
class ExporterAction
- : public KAction
+ : public TDEAction
{
KigExporter* mexp;
const KigPart* mdoc;
KigWidget* mw;
public:
ExporterAction( const KigPart* doc, KigWidget* w,
- KActionCollection* parent, KigExporter* exp );
+ TDEActionCollection* parent, KigExporter* exp );
void slotActivated();
};
ExporterAction::ExporterAction( const KigPart* doc, KigWidget* w,
- KActionCollection* parent, KigExporter* exp )
- : KAction( exp->menuEntryName(), KShortcut(), 0, 0, parent ),
+ TDEActionCollection* parent, KigExporter* exp )
+ : TDEAction( exp->menuEntryName(), TDEShortcut(), 0, 0, parent ),
mexp( exp ), mdoc( doc ), mw( w )
{
TQString iconstr = exp->menuIcon();
@@ -190,10 +190,10 @@ KigExportManager::~KigExportManager()
}
void KigExportManager::addMenuAction( const KigPart* doc, KigWidget* w,
- KActionCollection* coll )
+ TDEActionCollection* coll )
{
- KActionMenu* m =
- new KActionMenu( i18n( "&Export To" ), coll, "file_export" );
+ TDEActionMenu* m =
+ new TDEActionMenu( i18n( "&Export To" ), coll, "file_export" );
for ( uint i = 0; i < mexporters.size(); ++i )
m->insert( new ExporterAction( doc, w, coll, mexporters[i] ) );
}
diff --git a/kig/filters/exporter.h b/kig/filters/exporter.h
index 8fc210a1..b4d9f56b 100644
--- a/kig/filters/exporter.h
+++ b/kig/filters/exporter.h
@@ -24,7 +24,7 @@ class TQString;
class KigDocument;
class KigPart;
class KigWidget;
-class KActionCollection;
+class TDEActionCollection;
class KigExporter;
@@ -36,7 +36,7 @@ class KigExportManager
public:
static KigExportManager* instance();
void addMenuAction( const KigPart* doc, KigWidget* w,
- KActionCollection* coll );
+ TDEActionCollection* coll );
};
/**
diff --git a/kig/kig/kig.cpp b/kig/kig/kig.cpp
index b0eda780..79620ebc 100644
--- a/kig/kig/kig.cpp
+++ b/kig/kig/kig.cpp
@@ -169,7 +169,7 @@ void Kig::fileNew()
void Kig::openURL(const KURL& url)
{
- // Called for opening a file by either the KRecentFilesAction or our
+ // Called for opening a file by either the TDERecentFilesAction or our
// own fileOpen() method.
// if we are in the "initial state", we open the url in this window:
if ( m_part->url().isEmpty() && ! m_part->isModified() )
diff --git a/kig/kig/kig.h b/kig/kig/kig.h
index 0df1ad43..50e1e9ef 100644
--- a/kig/kig/kig.h
+++ b/kig/kig/kig.h
@@ -39,8 +39,8 @@
#include <tdeparts/mainwindow.h>
#include <dcopclient.h>
-class KToggleAction;
-class KRecentFilesAction;
+class TDEToggleAction;
+class TDERecentFilesAction;
/**
* This is the application "Shell". It has a menubar, toolbar, and
@@ -136,10 +136,10 @@ class Kig : public KParts::MainWindow
KParts::ReadWritePart *m_part;
//#ifdef KIG_DONT_USE_NEW_KMAINWINDOW_FEATURES
- KToggleAction *m_toolbarAction;
- KToggleAction *m_statusbarAction;
+ TDEToggleAction *m_toolbarAction;
+ TDEToggleAction *m_statusbarAction;
//#endif
- KRecentFilesAction *m_recentFilesAction;
+ TDERecentFilesAction *m_recentFilesAction;
TDEConfig* config;
diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp
index ef7fa470..3e85d0b4 100644
--- a/kig/kig/kig_part.cpp
+++ b/kig/kig/kig_part.cpp
@@ -83,17 +83,17 @@ TDEAboutData* KigPart::createAboutData()
}
class SetCoordinateSystemAction
- : public KSelectAction
+ : public TDESelectAction
{
KigPart& md;
public:
- SetCoordinateSystemAction( KigPart& d, KActionCollection* parent );
+ SetCoordinateSystemAction( KigPart& d, TDEActionCollection* parent );
void slotActivated( int index );
};
SetCoordinateSystemAction::SetCoordinateSystemAction(
- KigPart& d, KActionCollection* parent )
- : KSelectAction( i18n( "&Set Coordinate System" ), 0, parent, "settings_set_coordinate_system" ),
+ KigPart& d, TDEActionCollection* parent )
+ : TDESelectAction( i18n( "&Set Coordinate System" ), 0, parent, "settings_set_coordinate_system" ),
md( d )
{
setItems( CoordinateSystemFactory::names() );
@@ -218,7 +218,7 @@ void KigPart::setupActions()
this, TQT_SLOT( slotSelectAll() ), actionCollection() );
aDeselectAll = KStdAction::deselect(
this, TQT_SLOT( slotDeselectAll() ), actionCollection() );
- aInvertSelection = new KAction(
+ aInvertSelection = new TDEAction(
i18n( "Invert Selection" ), "", 0, this,
TQT_SLOT( slotInvertSelection() ), actionCollection(),
"edit_invert_selection" );
@@ -227,30 +227,30 @@ void KigPart::setupActions()
KIconLoader* l = instance()->iconLoader();
TQPixmap tmp;
- aDeleteObjects = new KAction(
+ aDeleteObjects = new TDEAction(
i18n("&Delete Objects"), "editdelete", Key_Delete, this,
TQT_SLOT(deleteObjects()), actionCollection(), "delete_objects");
aDeleteObjects->setToolTip(i18n("Delete the selected objects"));
- aCancelConstruction = new KAction(
+ aCancelConstruction = new TDEAction(
i18n("Cancel Construction"), "stop", Key_Escape, this,
TQT_SLOT(cancelConstruction()), actionCollection(), "cancel_construction");
aCancelConstruction->setToolTip(
i18n("Cancel the construction of the object being constructed"));
aCancelConstruction->setEnabled(false);
- aShowHidden = new KAction(
+ aShowHidden = new TDEAction(
i18n("U&nhide All"), 0, this, TQT_SLOT( showHidden() ),
actionCollection(), "edit_unhide_all");
aShowHidden->setToolTip(i18n("Show all hidden objects"));
aShowHidden->setEnabled( true );
- aNewMacro = new KAction(
+ aNewMacro = new TDEAction(
i18n("&New Macro..."), "gear", 0, this, TQT_SLOT(newMacro()),
actionCollection(), "macro_action");
aNewMacro->setToolTip(i18n("Define a new macro"));
- aConfigureTypes = new KAction(
+ aConfigureTypes = new TDEAction(
i18n("Manage &Types..."), 0, this, TQT_SLOT(editTypes()),
actionCollection(), "types_edit");
aConfigureTypes->setToolTip(i18n("Manage macro types."));
@@ -258,7 +258,7 @@ void KigPart::setupActions()
KigExportManager::instance()->addMenuAction( this, m_widget->realWidget(),
actionCollection() );
- KAction* a = KStdAction::zoomIn( TQT_TQOBJECT(m_widget), TQT_SLOT( slotZoomIn() ),
+ TDEAction* a = KStdAction::zoomIn( TQT_TQOBJECT(m_widget), TQT_SLOT( slotZoomIn() ),
actionCollection() );
a->setToolTip( i18n( "Zoom in on the document" ) );
a->setWhatsThis( i18n( "Zoom in on the document" ) );
@@ -284,7 +284,7 @@ void KigPart::setupActions()
a = KStdAction::fullScreen( TQT_TQOBJECT(m_widget), TQT_SLOT( toggleFullScreen() ), actionCollection(), (TQWidget*)(widget()->parent()),"fullscreen" );
#else
tmp = l->loadIcon( "window_fullscreen", KIcon::Toolbar );
- a = new KAction(
+ a = new TDEAction(
i18n( "Full Screen" ), tmp, CTRL+SHIFT+Key_F,
m_widget, TQT_SLOT( toggleFullScreen() ),
actionCollection(), "fullscreen" );
@@ -293,37 +293,37 @@ void KigPart::setupActions()
a->setWhatsThis( i18n( "View this document full-screen." ) );
// TODO: an icon for this..
- a = new KAction(
+ a = new TDEAction(
i18n( "&Select Shown Area" ), "viewmagfit", 0, TQT_TQOBJECT(m_widget), TQT_SLOT( zoomRect() ),
actionCollection(), "view_select_shown_rect" );
a->setToolTip( i18n( "Select the area that you want to be shown in the window." ) );
a->setWhatsThis( i18n( "Select the area that you want to be shown in the window." ) );
- a = new KAction(
+ a = new TDEAction(
i18n( "S&elect Zoom Area" ), "viewmag", 0, TQT_TQOBJECT(m_widget), TQT_SLOT( zoomArea() ),
actionCollection(), "view_zoom_area" );
// a->setToolTip( i18n( "Select the area that you want to be shown in the window." ) );
// a->setWhatsThis( i18n( "Select the area that you want to be shown in the window." ) );
- aToggleGrid = new KToggleAction(
+ aToggleGrid = new TDEToggleAction(
i18n( "Show &Grid" ), 0, this, TQT_SLOT( toggleGrid() ),
actionCollection(), "settings_show_grid" );
aToggleGrid->setToolTip( i18n( "Show or hide the grid." ) );
aToggleGrid->setChecked( true );
- aToggleAxes = new KToggleAction(
+ aToggleAxes = new TDEToggleAction(
i18n( "Show &Axes" ), 0, this, TQT_SLOT( toggleAxes() ),
actionCollection(), "settings_show_axes" );
aToggleAxes->setToolTip( i18n( "Show or hide the axes." ) );
aToggleAxes->setChecked( true );
- aToggleNightVision = new KToggleAction(
+ aToggleNightVision = new TDEToggleAction(
i18n( "Wear Infrared Glasses" ), 0, this, TQT_SLOT( toggleNightVision() ),
actionCollection(), "settings_toggle_nightvision" );
aToggleNightVision->setToolTip( i18n( "Enable/Disable hidden objects visibility." ) );
aToggleNightVision->setChecked( false );
- // select coordinate system KActionMenu..
+ // select coordinate system TDEActionMenu..
aCoordSystem = new SetCoordinateSystemAction( *this, actionCollection() );
}
@@ -563,7 +563,7 @@ void KigPart::delObjects( const std::vector<ObjectHolder*>& os )
void KigPart::enableConstructActions( bool enabled )
{
for_each( aActions.begin(), aActions.end(),
- bind2nd( mem_fun( &KAction::setEnabled ),
+ bind2nd( mem_fun( &TDEAction::setEnabled ),
enabled ) );
}
diff --git a/kig/kig/kig_part.h b/kig/kig/kig_part.h
index 2a1c6506..140c56f6 100644
--- a/kig/kig/kig_part.h
+++ b/kig/kig/kig_part.h
@@ -29,12 +29,12 @@
#include "../objects/common.h"
class TDEAboutData;
-class KActionMenu;
+class TDEActionMenu;
class KCommandHistory;
class KPrinter;
-class KSelectAction;
-class KToolBar;
-class KToggleAction;
+class TDESelectAction;
+class TDEToolBar;
+class TDEToggleAction;
class KURL;
class TQWidget;
@@ -175,7 +175,7 @@ protected:
protected:
KigMode* mMode;
- KSelectAction* aCoordSystem;
+ TDESelectAction* aCoordSystem;
/**
* the command history
@@ -192,26 +192,26 @@ public:
// the previous mode. Enabling/disabling is done at the same time,
// of course..
// some MenuActions..
- TQPtrList<KAction> aMNewSegment;
- TQPtrList<KAction> aMNewPoint;
- TQPtrList<KAction> aMNewCircle;
- TQPtrList<KAction> aMNewLine;
- TQPtrList<KAction> aMNewOther;
- TQPtrList<KAction> aMNewAll;
- TQPtrList<KAction> aMNewConic;
-
-
- KAction* aCancelConstruction;
- KAction* aSelectAll;
- KAction* aDeselectAll;
- KAction* aInvertSelection;
- KAction* aDeleteObjects;
- KAction* aNewMacro;
- KAction* aShowHidden;
- KAction* aConfigureTypes;
- KToggleAction* aToggleGrid;
- KToggleAction* aToggleAxes;
- KToggleAction* aToggleNightVision;
+ TQPtrList<TDEAction> aMNewSegment;
+ TQPtrList<TDEAction> aMNewPoint;
+ TQPtrList<TDEAction> aMNewCircle;
+ TQPtrList<TDEAction> aMNewLine;
+ TQPtrList<TDEAction> aMNewOther;
+ TQPtrList<TDEAction> aMNewAll;
+ TQPtrList<TDEAction> aMNewConic;
+
+
+ TDEAction* aCancelConstruction;
+ TDEAction* aSelectAll;
+ TDEAction* aDeselectAll;
+ TDEAction* aInvertSelection;
+ TDEAction* aDeleteObjects;
+ TDEAction* aNewMacro;
+ TDEAction* aShowHidden;
+ TDEAction* aConfigureTypes;
+ TDEToggleAction* aToggleGrid;
+ TDEToggleAction* aToggleAxes;
+ TDEToggleAction* aToggleNightVision;
std::vector<KigGUIAction*> aActions;
/**
diff --git a/kig/misc/guiaction.cc b/kig/misc/guiaction.cc
index d42b7ca4..a4fdb0c9 100644
--- a/kig/misc/guiaction.cc
+++ b/kig/misc/guiaction.cc
@@ -82,7 +82,7 @@ void ConstructibleAction::act( KigPart& d )
KigGUIAction::KigGUIAction( GUIAction* act,
KigPart& doc,
TQObject* parent )
- : KAction( act->descriptiveName(),
+ : TDEAction( act->descriptiveName(),
doc.instance()->iconLoader()->loadIcon(
act->iconFileName(), KIcon::Toolbar, 0, KIcon::DefaultState, 0L, true ),
act->shortcut(),
diff --git a/kig/misc/guiaction.h b/kig/misc/guiaction.h
index 05ffb994..6187dbe3 100644
--- a/kig/misc/guiaction.h
+++ b/kig/misc/guiaction.h
@@ -32,7 +32,7 @@ class GUIAction;
class KigPart;
class KigGUIAction
- : public KAction
+ : public TDEAction
{
Q_OBJECT
diff --git a/kig/modes/popup.cc b/kig/modes/popup.cc
index ba778f43..b55adafb 100644
--- a/kig/modes/popup.cc
+++ b/kig/modes/popup.cc
@@ -185,7 +185,7 @@ NormalModePopupObjects::NormalModePopupObjects( KigPart& part,
NormalMode& mode,
const std::vector<ObjectHolder*>& objs,
const TQPoint& plc )
- : KPopupMenu( &view ), mplc( plc ), mpart( part ), mview( view ), mobjs( objs ),
+ : TDEPopupMenu( &view ), mplc( plc ), mpart( part ), mview( view ), mobjs( objs ),
mmode( mode ), monlylabels( false )
{
bool empty = objs.empty();
@@ -1177,7 +1177,7 @@ int ObjectChooserPopup::getObjectFromList( const TQPoint& p, KigWidget* w,
ObjectChooserPopup::ObjectChooserPopup( const TQPoint& p, KigWidget& view,
const std::vector<ObjectHolder*>& objs )
- : KPopupMenu(), mplc( p ), mview( view ), mobjs( objs ), mselected( -1 )
+ : TDEPopupMenu(), mplc( p ), mview( view ), mobjs( objs ), mselected( -1 )
{
for ( uint i = 0; i < mobjs.size(); i++ )
{
diff --git a/kig/modes/popup.h b/kig/modes/popup.h
index 3485bbea..d1fb89d5 100644
--- a/kig/modes/popup.h
+++ b/kig/modes/popup.h
@@ -44,7 +44,7 @@ class ObjectHolder;
* PopupActionProviders are disabled, and some others enabled..
*/
class NormalModePopupObjects
- : public KPopupMenu
+ : public TDEPopupMenu
{
Q_OBJECT
@@ -115,7 +115,7 @@ private:
* You can't use this class directly, but these's a convenience method.
*/
class ObjectChooserPopup
- : public KPopupMenu
+ : public TDEPopupMenu
{
Q_OBJECT
diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp
index db30d652..917a46fc 100644
--- a/kig/modes/typesdialog.cpp
+++ b/kig/modes/typesdialog.cpp
@@ -50,11 +50,11 @@ class MacroListElement
{
Macro* macro;
public:
- MacroListElement( KListView* lv, Macro* m );
+ MacroListElement( TDEListView* lv, Macro* m );
Macro* getMacro() const { return macro; }
};
-MacroListElement::MacroListElement( KListView* lv, Macro* m )
+MacroListElement::MacroListElement( TDEListView* lv, Macro* m )
: TQListViewItem( lv, TQString(), m->action->descriptiveName(), m->action->description() ),
macro( m )
{
diff --git a/kig/modes/typesdialogbase.ui b/kig/modes/typesdialogbase.ui
index 90216532..0a74d56d 100644
--- a/kig/modes/typesdialogbase.ui
+++ b/kig/modes/typesdialogbase.ui
@@ -36,7 +36,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListView">
+ <widget class="TDEListView">
<column>
<property name="text">
<string>Icon</string>
diff --git a/kig/scripting/newscriptwizard.cc b/kig/scripting/newscriptwizard.cc
index 67a0b9a4..c883a159 100644
--- a/kig/scripting/newscriptwizard.cc
+++ b/kig/scripting/newscriptwizard.cc
@@ -83,7 +83,7 @@ NewScriptWizard::NewScriptWizard( TQWidget* parent, ScriptModeBase* mode )
hli = dynamic_cast<KTextEditor::HighlightingInterface*>( document );
// displaying the left border with line numbers
- KToggleAction *a = dynamic_cast<KToggleAction*>( editor->actionCollection()->action("view_line_numbers") );
+ TDEToggleAction *a = dynamic_cast<TDEToggleAction*>( editor->actionCollection()->action("view_line_numbers") );
a->activate();
// saving the state of dynamic word wrap and disabling it
@@ -94,14 +94,14 @@ NewScriptWizard::NewScriptWizard( TQWidget* parent, ScriptModeBase* mode )
noHlStyle = hli->hlMode();
// creating the popup menu
- KPopupMenu* pm = new KPopupMenu( editor );
+ TDEPopupMenu* pm = new TDEPopupMenu( editor );
// creating the actions for the code editor...
- KActionCollection* ac = new KActionCollection( editor );
- KAction* undoAction = KStdAction::undo( TQT_TQOBJECT(this), TQT_SLOT( slotUndo() ), ac );
- KAction* redoAction = KStdAction::redo( TQT_TQOBJECT(this), TQT_SLOT( slotRedo() ), ac );
- KAction* cutAction = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( slotCut() ), ac );
- KAction* copyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), ac );
- KAction* pasteAction = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPaste() ), ac );
+ TDEActionCollection* ac = new TDEActionCollection( editor );
+ TDEAction* undoAction = KStdAction::undo( TQT_TQOBJECT(this), TQT_SLOT( slotUndo() ), ac );
+ TDEAction* redoAction = KStdAction::redo( TQT_TQOBJECT(this), TQT_SLOT( slotRedo() ), ac );
+ TDEAction* cutAction = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( slotCut() ), ac );
+ TDEAction* copyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), ac );
+ TDEAction* pasteAction = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPaste() ), ac );
// ... and plugging them into the popup menu (to build it, of course :) )
undoAction->plug( pm );
redoAction->plug( pm );
diff --git a/kiten/configdictionaries.cpp b/kiten/configdictionaries.cpp
index 1df5a36b..e6ec117d 100644
--- a/kiten/configdictionaries.cpp
+++ b/kiten/configdictionaries.cpp
@@ -76,7 +76,7 @@ void ConfigDictionaries::writeDictionaries()
void ConfigDictionaries::readDictionaryList(const TQString& group)
{
- KListView* list;
+ TDEListView* list;
TQStringList names;
if (group == "edict")
{
@@ -104,7 +104,7 @@ void ConfigDictionaries::readDictionaryList(const TQString& group)
void ConfigDictionaries::writeDictionaryList(const TQString& group)
{
- KListView* list;
+ TDEListView* list;
if (group == "edict")
list = edictList;
else //if (group == "kanjidic")
@@ -138,7 +138,7 @@ void ConfigDictionaries::slotDelSelEdict() { delSel(edictList); }
void ConfigDictionaries::slotAddKanjidic() { add(kanjidicList); }
void ConfigDictionaries::slotDelSelKanjidic() { delSel(kanjidicList); }
-void ConfigDictionaries::add(KListView* list)
+void ConfigDictionaries::add(TDEListView* list)
{
TQListViewItem *item = list->firstChild();
TQString filename = KFileDialog::getOpenFileName(item? TQFileInfo(item->text(1)).dirPath(true).append("/") : TQString());
@@ -149,7 +149,7 @@ void ConfigDictionaries::add(KListView* list)
emit widgetChanged();
}
-void ConfigDictionaries::delSel(KListView* list)
+void ConfigDictionaries::delSel(TDEListView* list)
{
TQListViewItem *file = list->selectedItem();
if (!file)
diff --git a/kiten/configdictionaries.h b/kiten/configdictionaries.h
index 22933ed3..7f8e1051 100644
--- a/kiten/configdictionaries.h
+++ b/kiten/configdictionaries.h
@@ -54,8 +54,8 @@ private:
Config* config;
void readDictionaryList(const TQString& group);
void writeDictionaryList(const TQString& group);
- void add(KListView* list);
- void delSel(KListView* list);
+ void add(TDEListView* list);
+ void delSel(TDEListView* list);
};
#endif
diff --git a/kiten/configdictionariesbase.ui b/kiten/configdictionariesbase.ui
index 3ad28605..77bb52ad 100644
--- a/kiten/configdictionariesbase.ui
+++ b/kiten/configdictionariesbase.ui
@@ -88,7 +88,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListView">
+ <widget class="TDEListView">
<column>
<property name="text">
<string>Name</string>
@@ -226,7 +226,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListView">
+ <widget class="TDEListView">
<column>
<property name="text">
<string>Name</string>
diff --git a/kiten/configfont.ui b/kiten/configfont.ui
index d198336a..90b5ac72 100644
--- a/kiten/configfont.ui
+++ b/kiten/configfont.ui
@@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KFontChooser">
+ <widget class="TDEFontChooser">
<property name="name">
<cstring>kcfg_font</cstring>
</property>
diff --git a/kiten/kiten.cpp b/kiten/kiten.cpp
index 0a10ba0c..c5609c21 100644
--- a/kiten/kiten.cpp
+++ b/kiten/kiten.cpp
@@ -46,7 +46,7 @@
#include <cassert>
-TopLevel::TopLevel(TQWidget *parent, const char *name) : KMainWindow(parent, name)
+TopLevel::TopLevel(TQWidget *parent, const char *name) : TDEMainWindow(parent, name)
{
#if TDE_VERSION > 305
setStandardToolBarMenuEnabled(true);
@@ -67,27 +67,27 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) : KMainWindow(parent, nam
(void) KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(print()), actionCollection());
(void) KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection());
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
- (void) new KAction(i18n("&Learn"), "pencil", CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(createLearn()), actionCollection(), "file_learn");
- (void) new KAction(i18n("&Dictionary Editor..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(createEEdit()), actionCollection(), "dict_editor");
- (void) new KAction(i18n("Ra&dical Search..."), "gear", CTRL+Key_R, TQT_TQOBJECT(this), TQT_SLOT(radicalSearch()), actionCollection(), "search_radical");
+ (void) new TDEAction(i18n("&Learn"), "pencil", CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(createLearn()), actionCollection(), "file_learn");
+ (void) new TDEAction(i18n("&Dictionary Editor..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(createEEdit()), actionCollection(), "dict_editor");
+ (void) new TDEAction(i18n("Ra&dical Search..."), "gear", CTRL+Key_R, TQT_TQOBJECT(this), TQT_SLOT(radicalSearch()), actionCollection(), "search_radical");
Edit = new EditAction(i18n("Search Edit"), 0, TQT_TQOBJECT(this), TQT_SLOT(search()), actionCollection(), "search_edit");
- (void) new KAction(i18n("&Clear Search Bar"), BarIcon("locationbar_erase", 16), CTRL+Key_N, Edit, TQT_SLOT(clear()), actionCollection(), "clear_search");
- (void) new KAction(i18n("S&earch"), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT(search()), actionCollection(), "search");
- (void) new KAction(i18n("Search with &Beginning of Word"), 0, TQT_TQOBJECT(this), TQT_SLOT(searchBeginning()), actionCollection(), "search_beginning");
- (void) new KAction(i18n("Search &Anywhere"), 0, TQT_TQOBJECT(this), TQT_SLOT(searchAnywhere()), actionCollection(), "search_anywhere");
- (void) new KAction(i18n("Stro&kes"), "paintbrush", CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT(strokeSearch()), actionCollection(), "search_stroke");
- (void) new KAction(i18n("&Grade"), "leftjust", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(gradeSearch()), actionCollection(), "search_grade");
- kanjiCB = new KToggleAction(i18n("&Kanjidic"), "kanjidic", CTRL+Key_K, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "kanji_toggle");
- deinfCB = new KToggleAction(i18n("&Deinflect Verbs in Regular Search"), 0, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "deinf_toggle");
- comCB = new KToggleAction(i18n("&Filter Rare"), "filter", CTRL+Key_F, TQT_TQOBJECT(this), TQT_SLOT(toggleCom()), actionCollection(), "common");
- autoSearchToggle = new KToggleAction(i18n("&Automatically Search Clipboard Selections"), "find", 0, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "autosearch_toggle");
- irAction = new KAction(i18n("Search &in Results"), "find", CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(resultSearch()), actionCollection(), "search_in_results");
+ (void) new TDEAction(i18n("&Clear Search Bar"), BarIcon("locationbar_erase", 16), CTRL+Key_N, Edit, TQT_SLOT(clear()), actionCollection(), "clear_search");
+ (void) new TDEAction(i18n("S&earch"), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT(search()), actionCollection(), "search");
+ (void) new TDEAction(i18n("Search with &Beginning of Word"), 0, TQT_TQOBJECT(this), TQT_SLOT(searchBeginning()), actionCollection(), "search_beginning");
+ (void) new TDEAction(i18n("Search &Anywhere"), 0, TQT_TQOBJECT(this), TQT_SLOT(searchAnywhere()), actionCollection(), "search_anywhere");
+ (void) new TDEAction(i18n("Stro&kes"), "paintbrush", CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT(strokeSearch()), actionCollection(), "search_stroke");
+ (void) new TDEAction(i18n("&Grade"), "leftjust", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(gradeSearch()), actionCollection(), "search_grade");
+ kanjiCB = new TDEToggleAction(i18n("&Kanjidic"), "kanjidic", CTRL+Key_K, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "kanji_toggle");
+ deinfCB = new TDEToggleAction(i18n("&Deinflect Verbs in Regular Search"), 0, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "deinf_toggle");
+ comCB = new TDEToggleAction(i18n("&Filter Rare"), "filter", CTRL+Key_F, TQT_TQOBJECT(this), TQT_SLOT(toggleCom()), actionCollection(), "common");
+ autoSearchToggle = new TDEToggleAction(i18n("&Automatically Search Clipboard Selections"), "find", 0, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "autosearch_toggle");
+ irAction = new TDEAction(i18n("Search &in Results"), "find", CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(resultSearch()), actionCollection(), "search_in_results");
(void) KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), actionCollection());
- addAction = new KAction(i18n("Add &Kanji to Learning List"), 0, TQT_TQOBJECT(this), TQT_SLOT(addToList()), actionCollection(), "add");
+ addAction = new TDEAction(i18n("Add &Kanji to Learning List"), 0, TQT_TQOBJECT(this), TQT_SLOT(addToList()), actionCollection(), "add");
addAction->setEnabled(false);
- (void) new KAction(i18n("Configure &Global Shortcuts..."), "configure_shortcuts", 0, TQT_TQOBJECT(this), TQT_SLOT(configureGlobalKeys()), actionCollection(), "options_configure_keybinding");
+ (void) new TDEAction(i18n("Configure &Global Shortcuts..."), "configure_shortcuts", 0, TQT_TQOBJECT(this), TQT_SLOT(configureGlobalKeys()), actionCollection(), "options_configure_keybinding");
- historyAction = new KListAction(i18n("&History"), 0, 0, 0, actionCollection(), "history");
+ historyAction = new TDEListAction(i18n("&History"), 0, 0, 0, actionCollection(), "history");
connect(historyAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(goInHistory(int)));
backAction = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(back()), actionCollection());
forwardAction = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(forward()), actionCollection());
diff --git a/kiten/kiten.h b/kiten/kiten.h
index f82542fb..ef5cfda4 100644
--- a/kiten/kiten.h
+++ b/kiten/kiten.h
@@ -33,12 +33,12 @@ class ConfigureDialog;
class EditAction;
class TDEGlobalAccel;
class KStatusBar;
-class KToggleAction;
-class KListAction;
+class TDEToggleAction;
+class TDEListAction;
class Learn;
class ResultView;
-class KDE_EXPORT TopLevel : public KMainWindow
+class KDE_EXPORT TopLevel : public TDEMainWindow
{
Q_OBJECT
@@ -100,15 +100,15 @@ private:
Rad _Rad;
Deinf::Index _DeinfIndex;
ResultView *_ResultView;
- KToggleAction *kanjiCB;
- KToggleAction *autoSearchToggle;
- KToggleAction *deinfCB;
- KListAction *historyAction;
- KAction *irAction;
- KAction *addAction;
- KToggleAction *comCB;
- KAction *backAction;
- KAction *forwardAction;
+ TDEToggleAction *kanjiCB;
+ TDEToggleAction *autoSearchToggle;
+ TDEToggleAction *deinfCB;
+ TDEListAction *historyAction;
+ TDEAction *irAction;
+ TDEAction *addAction;
+ TDEToggleAction *comCB;
+ TDEAction *backAction;
+ TDEAction *forwardAction;
TDEGlobalAccel *Accel;
diff --git a/kiten/learn.cpp b/kiten/learn.cpp
index 6ffbaeea..cc85487e 100644
--- a/kiten/learn.cpp
+++ b/kiten/learn.cpp
@@ -61,7 +61,7 @@ int LearnItem::compare(TQListViewItem *item, int col, bool ascending) const
const int Learn::numberOfAnswers = 5;
Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name)
- : KMainWindow(parent, name), initialized(false), isMod(false), prevItem(0), curItem(0)
+ : TDEMainWindow(parent, name), initialized(false), isMod(false), prevItem(0), curItem(0)
{
index = parentDict;
@@ -83,7 +83,7 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name)
View->setBasicMode(true);
connect(View, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SIGNAL(linkClicked(const TQString &)));
- List = new KListView(listTop);
+ List = new TDEListView(listTop);
List->addColumn(i18n("Kanji"));
List->addColumn(i18n("Meanings"));
@@ -99,7 +99,7 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name)
List->setMultiSelection(true);
List->setDragEnabled(true);
List->setSorting(4);
- List->setSelectionModeExt(KListView::Extended);
+ List->setSelectionModeExt(TDEListView::Extended);
connect(List, TQT_SIGNAL(executed(TQListViewItem *)), TQT_SLOT(showKanji(TQListViewItem *)));
connect(List, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(itemSelectionChanged()));
@@ -113,20 +113,20 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name)
grades.append(i18n("Others in Jouyou"));
grades.append(i18n("Jinmeiyou"));
- /*KAction *closeAction = */(void) KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+ /*TDEAction *closeAction = */(void) KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
printAct = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(print()), actionCollection());
forwardAct = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(next()), actionCollection());
forwardAct->plug(toolBar());
backAct = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(prev()), actionCollection());
backAct->plug(toolBar());
- cheatAct = new KAction(i18n("&Cheat"), CTRL + Key_C, TQT_TQOBJECT(this), TQT_SLOT(cheat()), actionCollection(), "cheat");
- randomAct = new KAction(i18n("&Random"), "goto", CTRL + Key_R, TQT_TQOBJECT(this), TQT_SLOT(random()), actionCollection(), "random");
- gradeAct = new KListAction(i18n("Grade"), 0, 0, 0, actionCollection(), "grade");
+ cheatAct = new TDEAction(i18n("&Cheat"), CTRL + Key_C, TQT_TQOBJECT(this), TQT_SLOT(cheat()), actionCollection(), "cheat");
+ randomAct = new TDEAction(i18n("&Random"), "goto", CTRL + Key_R, TQT_TQOBJECT(this), TQT_SLOT(random()), actionCollection(), "random");
+ gradeAct = new TDEListAction(i18n("Grade"), 0, 0, 0, actionCollection(), "grade");
gradeAct->setItems(grades);
connect(gradeAct, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(updateGrade()));
- removeAct = new KAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, TQT_TQOBJECT(this), TQT_SLOT(del()), actionCollection(), "del");
- addAct = new KAction(i18n("&Add"), "edit_add", CTRL + Key_A, TQT_TQOBJECT(this), TQT_SLOT(add()), actionCollection(), "add");
- addAllAct = new KAction(i18n("Add A&ll"), 0, TQT_TQOBJECT(this), TQT_SLOT(addAll()), actionCollection(), "addall");
+ removeAct = new TDEAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, TQT_TQOBJECT(this), TQT_SLOT(del()), actionCollection(), "del");
+ addAct = new TDEAction(i18n("&Add"), "edit_add", CTRL + Key_A, TQT_TQOBJECT(this), TQT_SLOT(add()), actionCollection(), "add");
+ addAllAct = new TDEAction(i18n("Add A&ll"), 0, TQT_TQOBJECT(this), TQT_SLOT(addAll()), actionCollection(), "addall");
newAct = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(openNew()), actionCollection());
openAct = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection());
saveAct = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection());
diff --git a/kiten/learn.h b/kiten/learn.h
index d6fe41ef..2312cf46 100644
--- a/kiten/learn.h
+++ b/kiten/learn.h
@@ -28,7 +28,7 @@
#include "widgets.h"
-class KAction;
+class TDEAction;
class KPushButton;
class TQButtonGroup;
class TQListViewItem;
@@ -43,7 +43,7 @@ public:
int compare(TQListViewItem *item, int col, bool ascending) const;
};
-class Learn : public KMainWindow
+class Learn : public TDEMainWindow
{
Q_OBJECT
@@ -118,7 +118,7 @@ class Learn : public KMainWindow
Dict::Index *index;
- KListView *List;
+ TDEListView *List;
KPushButton *Save;
KPushButton *Del;
KPushButton *qDel;
@@ -146,19 +146,19 @@ class Learn : public KMainWindow
// to the list.
TQString randomMeaning(TQStringList &oldMeanings);
- KAction *forwardAct;
- KAction *printAct;
- KAction *backAct;
- KAction *cheatAct;
- KAction *saveAct;
- KAction *openAct;
- KAction *newAct;
- KAction *saveAsAct;
- KAction *addAct;
- KAction *addAllAct;
- KAction *removeAct;
- KAction *randomAct;
- KListAction *gradeAct;
+ TDEAction *forwardAct;
+ TDEAction *printAct;
+ TDEAction *backAct;
+ TDEAction *cheatAct;
+ TDEAction *saveAct;
+ TDEAction *openAct;
+ TDEAction *newAct;
+ TDEAction *saveAsAct;
+ TDEAction *addAct;
+ TDEAction *addAllAct;
+ TDEAction *removeAct;
+ TDEAction *randomAct;
+ TDEListAction *gradeAct;
int getCurrentGrade(void);
void setCurrentGrade(int grade);
diff --git a/kiten/optiondialog.h b/kiten/optiondialog.h
index 61e5a4c7..d9319a4d 100644
--- a/kiten/optiondialog.h
+++ b/kiten/optiondialog.h
@@ -22,9 +22,9 @@
#ifndef OPTIONDIALOG_H
#define OPTIONDIALOG_H
-class KListView;
+class TDEListView;
class TQString;
-class KFontChooser;
+class TDEFontChooser;
class TQLabel;
class TQPushButton;
class TQComboBox;
diff --git a/kiten/rad.cpp b/kiten/rad.cpp
index 54fa4025..602cdf6a 100644
--- a/kiten/rad.cpp
+++ b/kiten/rad.cpp
@@ -276,13 +276,13 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p
TQToolTip::add(strokesSpin, i18n("Show radicals having this number of strokes"));
middlevLayout->addWidget(strokesSpin);
- List = new KListBox(this);
+ List = new TDEListBox(this);
middlevLayout->addWidget(List);
connect(List, TQT_SIGNAL(executed(TQListBoxItem *)), this, TQT_SLOT(executed(TQListBoxItem *)));
connect(strokesSpin, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateList(int)));
TQVBoxLayout *rightvlayout = new TQVBoxLayout(hlayout, KDialog::spacingHint());
- selectedList = new KListBox(this);
+ selectedList = new TDEListBox(this);
rightvlayout->addWidget(selectedList);
connect(selectedList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged()));
diff --git a/kiten/rad.h b/kiten/rad.h
index 6fe1ea23..54c5cc99 100644
--- a/kiten/rad.h
+++ b/kiten/rad.h
@@ -30,7 +30,7 @@ class TQLabel;
class TQListBoxItem;
class TQSpinBox;
class KPushButton;
-class KListBox;
+class TDEListBox;
class TQButtonGroup;
class KDE_EXPORT Radical
@@ -110,8 +110,8 @@ class KDE_EXPORT RadWidget : public TQWidget
KPushButton *clear;
TQButtonGroup *hotlistGroup;
TQCheckBox *totalStrokes;
- KListBox *List;
- KListBox *selectedList;
+ TDEListBox *List;
+ TDEListBox *selectedList;
TQStringList selected;
Rad *rad;
diff --git a/kiten/widgets.cpp b/kiten/widgets.cpp
index f7fec883..9a278ecb 100644
--- a/kiten/widgets.cpp
+++ b/kiten/widgets.cpp
@@ -293,10 +293,10 @@ void ResultView::updateFont()
// nice EDICT dictionary editor
eEdit::eEdit(const TQString &_filename, TQWidget *parent, const char *name)
- : KMainWindow(parent, name)
+ : TDEMainWindow(parent, name)
, filename(_filename)
{
- List = new KListView(this);
+ List = new TDEListView(this);
setCentralWidget(List);
List->addColumn(i18n("Kanji"));
@@ -318,9 +318,9 @@ eEdit::eEdit(const TQString &_filename, TQWidget *parent, const char *name)
List->setDragEnabled(true);
saveAct = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection());
- removeAct = new KAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, TQT_TQOBJECT(this), TQT_SLOT(del()), actionCollection(), "del");
- (void) new KAction(i18n("&Disable Dictionary"), 0, TQT_TQOBJECT(this), TQT_SLOT(disable()), actionCollection(), "disable");
- addAct = new KAction(i18n("&Add"), "edit_add", CTRL + Key_A, TQT_TQOBJECT(this), TQT_SLOT(add()), actionCollection(), "add");
+ removeAct = new TDEAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, TQT_TQOBJECT(this), TQT_SLOT(del()), actionCollection(), "del");
+ (void) new TDEAction(i18n("&Disable Dictionary"), 0, TQT_TQOBJECT(this), TQT_SLOT(disable()), actionCollection(), "disable");
+ addAct = new TDEAction(i18n("&Add"), "edit_add", CTRL + Key_A, TQT_TQOBJECT(this), TQT_SLOT(add()), actionCollection(), "add");
(void) KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
createGUI("eeditui.rc");
@@ -338,7 +338,7 @@ eEdit::~eEdit()
void eEdit::add()
{
if (List)
- new KListViewItem(List);
+ new TDEListViewItem(List);
}
void eEdit::openFile(const TQString &file)
@@ -437,7 +437,7 @@ void eEdit::del()
// sorta taken from konqy
EditAction::EditAction(const TQString& text, int accel, const TQObject *receiver, const char *member, TQObject* parent, const char* name)
- : KAction(text, accel, parent, name)
+ : TDEAction(text, accel, parent, name)
{
m_receiver = receiver;
m_member = member;
@@ -449,12 +449,12 @@ EditAction::~EditAction()
int EditAction::plug( TQWidget *w, int index )
{
- // if ( !w->inherits( "KToolBar" ) )
+ // if ( !w->inherits( "TDEToolBar" ) )
// return -1;
- KToolBar *toolBar = (KToolBar *)w;
+ TDEToolBar *toolBar = (TDEToolBar *)w;
- int id = KAction::getToolButtonID();
+ int id = TDEAction::getToolButtonID();
KRomajiEdit *comboBox = new KRomajiEdit(toolBar, "search edit");
toolBar->insertWidget( id, 70, comboBox, index );
@@ -477,10 +477,10 @@ int EditAction::plug( TQWidget *w, int index )
void EditAction::unplug( TQWidget *w )
{
-// if ( !w->inherits( "KToolBar" ) )
+// if ( !w->inherits( "TDEToolBar" ) )
// return;
- KToolBar *toolBar = (KToolBar *)w;
+ TDEToolBar *toolBar = (TDEToolBar *)w;
int idx = findContainer( w );
diff --git a/kiten/widgets.h b/kiten/widgets.h
index 7ca5ac60..1bf0782a 100644
--- a/kiten/widgets.h
+++ b/kiten/widgets.h
@@ -28,7 +28,7 @@
#include <kmainwindow.h>
#include <ktextbrowser.h>
-class KListView;
+class TDEListView;
class KStatusBar;
#include "dict.h"
@@ -64,7 +64,7 @@ class KDE_EXPORT ResultView : public KTextBrowser
bool basicMode;
};
-class KDE_EXPORT eEdit : public KMainWindow
+class KDE_EXPORT eEdit : public TDEMainWindow
{
Q_OBJECT
@@ -81,16 +81,16 @@ class KDE_EXPORT eEdit : public KMainWindow
void openFile(const TQString &);
private:
- KListView *List;
+ TDEListView *List;
TQString filename;
KStatusBar *StatusBar;
- KAction *addAct;
- KAction *removeAct;
- KAction *saveAct;
+ TDEAction *addAct;
+ TDEAction *removeAct;
+ TDEAction *saveAct;
bool isMod;
};
-class KDE_EXPORT EditAction : public KAction
+class KDE_EXPORT EditAction : public TDEAction
{
Q_OBJECT
diff --git a/klatin/klatin/klatin.cpp b/klatin/klatin/klatin.cpp
index d11a1bfa..71eb82e6 100644
--- a/klatin/klatin/klatin.cpp
+++ b/klatin/klatin/klatin.cpp
@@ -33,7 +33,7 @@
#include "settings.h"
KLatin::KLatin(TQWidget* parent, const char *name)
- : KMainWindow(parent, name)
+ : TDEMainWindow(parent, name)
{
m_section = 0;
@@ -54,10 +54,10 @@ void KLatin::setupActions()
{
// Setup various menu actions
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(loadSettings()), actionCollection());
- m_loadVocab = new KAction(i18n("Load &Vocabulary"), 0, TQT_TQOBJECT(this), TQT_SLOT(loadVocab()), actionCollection(), "go_vocab");
- m_loadGrammar = new KAction(i18n("Load &Grammar"), 0, TQT_TQOBJECT(this), TQT_SLOT(loadGrammar()), actionCollection(), "go_grammar");
- m_loadVerbs = new KAction(i18n("Load V&erbs"), 0, TQT_TQOBJECT(this), TQT_SLOT(loadVerbs()), actionCollection(), "go_verbs");
- m_loadRevision = new KAction(i18n("Load &Revision"), 0, TQT_TQOBJECT(this), TQT_SLOT(loadRevision()), actionCollection(), "go_revision");
+ m_loadVocab = new TDEAction(i18n("Load &Vocabulary"), 0, TQT_TQOBJECT(this), TQT_SLOT(loadVocab()), actionCollection(), "go_vocab");
+ m_loadGrammar = new TDEAction(i18n("Load &Grammar"), 0, TQT_TQOBJECT(this), TQT_SLOT(loadGrammar()), actionCollection(), "go_grammar");
+ m_loadVerbs = new TDEAction(i18n("Load V&erbs"), 0, TQT_TQOBJECT(this), TQT_SLOT(loadVerbs()), actionCollection(), "go_verbs");
+ m_loadRevision = new TDEAction(i18n("Load &Revision"), 0, TQT_TQOBJECT(this), TQT_SLOT(loadRevision()), actionCollection(), "go_revision");
KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
}
diff --git a/klatin/klatin/klatin.h b/klatin/klatin/klatin.h
index fc1c736b..7cff071a 100644
--- a/klatin/klatin/klatin.h
+++ b/klatin/klatin/klatin.h
@@ -33,7 +33,7 @@
#include "klatinsettings_vocabpage.h"
/** @short Main application class */
-class KLatin : public KMainWindow
+class KLatin : public TDEMainWindow
{
Q_OBJECT
@@ -68,10 +68,10 @@ private slots:
private:
- KAction *m_loadVocab;
- KAction *m_loadGrammar;
- KAction *m_loadVerbs;
- KAction *m_loadRevision;
+ TDEAction *m_loadVocab;
+ TDEAction *m_loadGrammar;
+ TDEAction *m_loadVerbs;
+ TDEAction *m_loadRevision;
KLatinChoose *klatinchoose;
KLatinGrammar *klatingrammarsection;
diff --git a/klettres/ChangeLog b/klettres/ChangeLog
index 52ca488f..e03a4463 100644
--- a/klettres/ChangeLog
+++ b/klettres/ChangeLog
@@ -7,7 +7,7 @@ Buttons appear consequently in the 2 styles to allow menuBar and other style.
- better internationalization
- i18n() the KLettres on the splash-screen
- suppress the sound with the splash-screen as it was too long
-- add menubar, toolbar and statusbar, configurable using KAction
+- add menubar, toolbar and statusbar, configurable using TDEAction
- settings allow to choose the language and the level from the menuBar and toolBar
- statusBar indicates level and language
- suppressed the .ui file
diff --git a/klettres/klettres/fontsdlg.ui b/klettres/klettres/fontsdlg.ui
index 5853adfd..181b9a1b 100644
--- a/klettres/klettres/fontsdlg.ui
+++ b/klettres/klettres/fontsdlg.ui
@@ -16,7 +16,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KFontChooser" row="0" column="0">
+ <widget class="TDEFontChooser" row="0" column="0">
<property name="name">
<cstring>kcfg_Font</cstring>
</property>
diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp
index ca005800..eaba8fc2 100644
--- a/klettres/klettres/klettres.cpp
+++ b/klettres/klettres/klettres.cpp
@@ -54,11 +54,11 @@ const int ID_GROWNB = 101;
const int ID_MENUBARB = 102;
KLettres::KLettres()
- : KMainWindow( 0, "KLettres" )
+ : TDEMainWindow( 0, "KLettres" )
{
mNewStuff = 0;
m_view = new KLettresView(this);
- // tell the KMainWindow that this is indeed the main widget
+ // tell the TDEMainWindow that this is indeed the main widget
setCentralWidget(m_view);
//Scan for existing languages -> m_languages
findLanguages();
@@ -195,25 +195,25 @@ bool KLettres::loadLayout(TQDomDocument &layoutDocument)
void KLettres::setupActions()
{
- KAction *m_newAction = new KAction(i18n("New Sound"), "file_new", CTRL+Key_N, TQT_TQOBJECT(m_view), TQT_SLOT(game()), actionCollection(), "play_new");
+ TDEAction *m_newAction = new TDEAction(i18n("New Sound"), "file_new", CTRL+Key_N, TQT_TQOBJECT(m_view), TQT_SLOT(game()), actionCollection(), "play_new");
m_newAction->setToolTip(i18n("Play a new sound"));
m_newAction->setWhatsThis(i18n("You can play a new sound by clicking this button or using the File menu, New Sound."));
- new KAction( i18n("Get Alphabet in New Language..."), "knewstuff", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" );
- KAction *m_playAgainAction = new KAction(i18n("Replay Sound"),"player_play", CTRL+Key_P, TQT_TQOBJECT(m_view), TQT_SLOT(slotPlayAgain()), actionCollection(), "play_again");
+ new TDEAction( i18n("Get Alphabet in New Language..."), "knewstuff", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" );
+ TDEAction *m_playAgainAction = new TDEAction(i18n("Replay Sound"),"player_play", CTRL+Key_P, TQT_TQOBJECT(m_view), TQT_SLOT(slotPlayAgain()), actionCollection(), "play_again");
m_playAgainAction->setToolTip(i18n("Play the same sound again"));
m_playAgainAction->setWhatsThis(i18n("You can replay the same sound again by clicking this button or using the File menu, Replay Sound."));
KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
- m_menubarAction = new KToggleAction(i18n("Show &Menubar"),"editclear", CTRL+Key_M, TQT_TQOBJECT(this), TQT_SLOT(slotMenubar()), actionCollection(), "menubar");
+ m_menubarAction = new TDEToggleAction(i18n("Show &Menubar"),"editclear", CTRL+Key_M, TQT_TQOBJECT(this), TQT_SLOT(slotMenubar()), actionCollection(), "menubar");
m_menubarAction->setCheckedState(i18n("Hide &Menubar"));
m_menubarAction->setChecked(true);
m_menubarAction->setWhatsThis(i18n("You can show or hide the menubar as you wish by clicking this button."));
- m_levelAction = new KSelectAction(i18n("L&evel"), KShortcut(), actionCollection(), "levels");
+ m_levelAction = new TDESelectAction(i18n("L&evel"), TDEShortcut(), actionCollection(), "levels");
m_levelAction->setToolTip(i18n("Select the level"));
m_levelAction->setWhatsThis(i18n("You can select the level: level 1 displays a letter and you hear it; level 2 does not display the letter, you only hear it; level 3 displays a syllable and you hear it; level 4 does not display the syllable, you only hear it."));
- m_languageAction = new KSelectAction(i18n("&Language"), KShortcut(), actionCollection(), "languages");
+ m_languageAction = new TDESelectAction(i18n("&Language"), TDEShortcut(), actionCollection(), "languages");
m_languageAction->setItems(m_languageNames);
m_levelsNames.append(i18n( "Level 1" ));
@@ -222,7 +222,7 @@ void KLettres::setupActions()
m_levelsNames.append(i18n( "Level 4" ));
m_levelAction->setItems(m_levelsNames);
- m_themeAction = new KSelectAction(i18n("Themes"), KShortcut(), actionCollection(), "looks");
+ m_themeAction = new TDESelectAction(i18n("Themes"), TDEShortcut(), actionCollection(), "looks");
m_themesNames.append(i18n("Classroom"));
m_themesNames.append(i18n("Arctic"));
m_themesNames.append(i18n("Desert"));
@@ -230,9 +230,9 @@ void KLettres::setupActions()
m_themeAction->setToolTip(i18n("Select the theme"));
m_themeAction->setWhatsThis(i18n("Here you can change the theme for KLettres. A theme consists in the background picture and the font color for the letter displayed."));
- m_kidAction = new KToggleAction(i18n("Mode Kid"), "klettres_kids", CTRL+Key_K, TQT_TQOBJECT(this), TQT_SLOT(slotModeKid()), actionCollection(), "mode_kid");
+ m_kidAction = new TDEToggleAction(i18n("Mode Kid"), "klettres_kids", CTRL+Key_K, TQT_TQOBJECT(this), TQT_SLOT(slotModeKid()), actionCollection(), "mode_kid");
m_kidAction->setWhatsThis(i18n("If you are in the Grown-up mode, clicking on this button will set up the Kid mode. The Kid mode has no menubar and the font is bigger in the statusbar."));
- m_grownupAction = new KToggleAction(i18n("Mode Grown-up"), "klettres_grownup", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(slotModeGrownup()), actionCollection(), "mode_grownup");
+ m_grownupAction = new TDEToggleAction(i18n("Mode Grown-up"), "klettres_grownup", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(slotModeGrownup()), actionCollection(), "mode_grownup");
m_grownupAction->setWhatsThis(i18n("The Grown-up mode is the normal mode where you can see the menubar."));
connect(m_levelAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeLevel(int)));
@@ -259,7 +259,7 @@ void KLettres::setupToolbars()
{
//toolbar for special characters
m_secondToolbar = toolBar("secondToolbar");
- m_secondToolbar->setBarPos(KToolBar::Bottom);
+ m_secondToolbar->setBarPos(TDEToolBar::Bottom);
}
void KLettres::optionsPreferences()
@@ -482,7 +482,7 @@ void KLettres::loadLangToolBar()
void KLettres::slotPasteChar()
{
- KToolBarButton *charBut = (KToolBarButton* ) sender();
+ TDEToolBarButton *charBut = (TDEToolBarButton* ) sender();
m_view->m_letterEdit->insert(allData[charBut->id()]);
}
diff --git a/klettres/klettres/klettres.h b/klettres/klettres/klettres.h
index e717433f..02ff5197 100644
--- a/klettres/klettres/klettres.h
+++ b/klettres/klettres/klettres.h
@@ -32,10 +32,10 @@
#include "soundfactory.h"
class TQLabel;
-class KToggleAction;
-class KSelectAction;
+class TDEToggleAction;
+class TDESelectAction;
class KComboBox;
-class KToolBar;
+class TDEToolBar;
class KLNewStuff;
/**
@@ -43,7 +43,7 @@ class KLNewStuff;
* @author Anne-Marie Mahfouf <annemarie.mahfouf@free.fr>
* @version 1.4
*/
-class KLettres : public KMainWindow
+class KLettres : public TDEMainWindow
{
Q_OBJECT
@@ -69,7 +69,7 @@ public:
///Number corresponding to the selected language: 0 is Czech, 1 is Danish, 2 is English (default), 3 is French, 4 is Dutch, 5 is Slovak
//uint selectedLanguage;
///Action that sets up the Language menu
- KSelectAction *m_languageAction;
+ TDESelectAction *m_languageAction;
///Look for all languages available
void findLanguages();
@@ -81,15 +81,15 @@ protected:
///Call an instance of the KLettresView widget
KLettresView *m_view;
///Action that enables the ShowMenuBar item in the Settings menu
- KToggleAction *m_menubarAction;
+ TDEToggleAction *m_menubarAction;
///Action that sets up the Level menu
- KSelectAction *m_levelAction;
+ TDESelectAction *m_levelAction;
///Action that sets up the Look menu
- KSelectAction *m_themeAction;
+ TDESelectAction *m_themeAction;
///Action allow the Kid mode
- KToggleAction *m_kidAction;
+ TDEToggleAction *m_kidAction;
///Action allow the Grownup mode
- KToggleAction *m_grownupAction;
+ TDEToggleAction *m_grownupAction;
///Label stating the language in the statusbar
TQLabel *m_langLabel;
///Label stating the level in the statusbar
@@ -98,10 +98,10 @@ protected:
TQStringList m_levelsNames;
///Holds the looks
TQStringList m_themesNames;
- ///Create an instance of a KToolBar
- KToolBar *m_mainToolbar;
+ ///Create an instance of a TDEToolBar
+ TDEToolBar *m_mainToolbar;
///Second toolbar with buttons of special characters per language
- KToolBar *m_secondToolbar;
+ TDEToolBar *m_secondToolbar;
///is false when menubar button is not shown
bool menuBool;
///Build the main window menus
diff --git a/kmplot/kmplot/FktDlgData.ui b/kmplot/kmplot/FktDlgData.ui
index 705e2c09..90285af2 100644
--- a/kmplot/kmplot/FktDlgData.ui
+++ b/kmplot/kmplot/FktDlgData.ui
@@ -108,7 +108,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListView" row="0" column="0" rowspan="9" colspan="1">
+ <widget class="TDEListView" row="0" column="0" rowspan="9" colspan="1">
<property name="name">
<cstring>lb_fktliste</cstring>
</property>
diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp
index fa3f9cd3..879a4f41 100644
--- a/kmplot/kmplot/MainDlg.cpp
+++ b/kmplot/kmplot/MainDlg.cpp
@@ -82,7 +82,7 @@ MainDlg::MainDlg(TQWidget *parentWidget, const char *, TQObject *parent, const c
}
fdlg = 0;
coordsDialog = 0;
- m_popupmenu = new KPopupMenu(parentWidget);
+ m_popupmenu = new TDEPopupMenu(parentWidget);
view = new View( m_readonly, m_modified, m_popupmenu, parentWidget );
connect( view, TQT_SIGNAL( setStatusBarText(const TQString &)), this, TQT_SLOT( setReadOnlyStatusBarText(const TQString &) ) );
setWidget( view );
@@ -129,7 +129,7 @@ void MainDlg::setupActions()
KStdAction::saveAs( this, TQT_SLOT( slotSaveas() ), actionCollection() );
connect( kapp, TQT_SIGNAL( lastWindowClosed() ), kapp, TQT_SLOT( quit() ) );
- KAction *prefs = KStdAction::preferences( this, TQT_SLOT( slotSettings() ), actionCollection());
+ TDEAction *prefs = KStdAction::preferences( this, TQT_SLOT( slotSettings() ), actionCollection());
prefs->setText( i18n( "Configure KmPlot..." ) );
KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
@@ -137,15 +137,15 @@ void MainDlg::setupActions()
// KmPlot specific actions
// file menu
- ( void ) new KAction( i18n( "E&xport..." ), 0, this, TQT_SLOT( slotExport() ), actionCollection(), "export");
+ ( void ) new TDEAction( i18n( "E&xport..." ), 0, this, TQT_SLOT( slotExport() ), actionCollection(), "export");
//zoom menu
- m_mnuNoZoom = new KRadioAction(i18n("&No Zoom") ,"CTRL+0",TQT_TQOBJECT(view), TQT_SLOT( mnuNoZoom_clicked() ),actionCollection(),"no_zoom" );
- KRadioAction * mnuRectangular = new KRadioAction(i18n("Zoom &Rectangular"), "viewmagfit", "CTRL+1",TQT_TQOBJECT(view), TQT_SLOT( mnuRectangular_clicked() ),actionCollection(),"zoom_rectangular" );
- KRadioAction * mnuZoomIn = new KRadioAction(i18n("Zoom &In"), "viewmag+", "CTRL+2",TQT_TQOBJECT(view), TQT_SLOT( mnuZoomIn_clicked() ),actionCollection(),"zoom_in" );
- KRadioAction * mnuZoomOut = new KRadioAction(i18n("Zoom &Out"), "viewmag-", "CTRL+3",TQT_TQOBJECT(view), TQT_SLOT( mnuZoomOut_clicked() ),actionCollection(),"zoom_out" );
- KRadioAction * mnuZoomCenter = new KRadioAction(i18n("&Center Point") ,"CTRL+4",TQT_TQOBJECT(view), TQT_SLOT( mnuCenter_clicked() ),actionCollection(),"zoom_center" );
- (void ) new KAction(i18n("&Fit Widget to Trigonometric Functions") ,0,TQT_TQOBJECT(view), TQT_SLOT( mnuTrig_clicked() ),actionCollection(),"zoom_trig" );
+ m_mnuNoZoom = new TDERadioAction(i18n("&No Zoom") ,"CTRL+0",TQT_TQOBJECT(view), TQT_SLOT( mnuNoZoom_clicked() ),actionCollection(),"no_zoom" );
+ TDERadioAction * mnuRectangular = new TDERadioAction(i18n("Zoom &Rectangular"), "viewmagfit", "CTRL+1",TQT_TQOBJECT(view), TQT_SLOT( mnuRectangular_clicked() ),actionCollection(),"zoom_rectangular" );
+ TDERadioAction * mnuZoomIn = new TDERadioAction(i18n("Zoom &In"), "viewmag+", "CTRL+2",TQT_TQOBJECT(view), TQT_SLOT( mnuZoomIn_clicked() ),actionCollection(),"zoom_in" );
+ TDERadioAction * mnuZoomOut = new TDERadioAction(i18n("Zoom &Out"), "viewmag-", "CTRL+3",TQT_TQOBJECT(view), TQT_SLOT( mnuZoomOut_clicked() ),actionCollection(),"zoom_out" );
+ TDERadioAction * mnuZoomCenter = new TDERadioAction(i18n("&Center Point") ,"CTRL+4",TQT_TQOBJECT(view), TQT_SLOT( mnuCenter_clicked() ),actionCollection(),"zoom_center" );
+ (void ) new TDEAction(i18n("&Fit Widget to Trigonometric Functions") ,0,TQT_TQOBJECT(view), TQT_SLOT( mnuTrig_clicked() ),actionCollection(),"zoom_trig" );
m_mnuNoZoom->setExclusiveGroup("zoom_modes");
m_mnuNoZoom->setChecked(true);
mnuRectangular->setExclusiveGroup("zoom_modes");
@@ -154,52 +154,52 @@ void MainDlg::setupActions()
mnuZoomCenter->setExclusiveGroup("zoom_modes");
// help menu
- ( void ) new KAction( i18n( "Predefined &Math Functions" ), "functionhelp", 0, this, TQT_SLOT( slotNames() ), actionCollection(), "names" );
+ ( void ) new TDEAction( i18n( "Predefined &Math Functions" ), "functionhelp", 0, this, TQT_SLOT( slotNames() ), actionCollection(), "names" );
// edit menu
- ( void ) new KAction( i18n( "&Colors..." ), "colorize.png", 0, this, TQT_SLOT( editColors() ), actionCollection(), "editcolors" );
- ( void ) new KAction( i18n( "&Coordinate System..." ), "coords.png", 0, this, TQT_SLOT( editAxes() ), actionCollection(), "editaxes" );
- // ( void ) new KAction( i18n( "&Grid..." ), "coords.png", 0, this, TQT_SLOT( editGrid() ), actionCollection(), "editgrid" );
- ( void ) new KAction( i18n( "&Scaling..." ), "scaling", 0, this, TQT_SLOT( editScaling() ), actionCollection(), "editscaling" );
- ( void ) new KAction( i18n( "&Fonts..." ), "fonts", 0, this, TQT_SLOT( editFonts() ), actionCollection(), "editfonts" );
+ ( void ) new TDEAction( i18n( "&Colors..." ), "colorize.png", 0, this, TQT_SLOT( editColors() ), actionCollection(), "editcolors" );
+ ( void ) new TDEAction( i18n( "&Coordinate System..." ), "coords.png", 0, this, TQT_SLOT( editAxes() ), actionCollection(), "editaxes" );
+ // ( void ) new TDEAction( i18n( "&Grid..." ), "coords.png", 0, this, TQT_SLOT( editGrid() ), actionCollection(), "editgrid" );
+ ( void ) new TDEAction( i18n( "&Scaling..." ), "scaling", 0, this, TQT_SLOT( editScaling() ), actionCollection(), "editscaling" );
+ ( void ) new TDEAction( i18n( "&Fonts..." ), "fonts", 0, this, TQT_SLOT( editFonts() ), actionCollection(), "editfonts" );
- ( void ) new KAction( i18n( "Coordinate System I" ), "ksys1.png", 0, this, TQT_SLOT( slotCoord1() ), actionCollection(), "coord_i" );
- ( void ) new KAction( i18n( "Coordinate System II" ), "ksys2.png", 0, this, TQT_SLOT( slotCoord2() ), actionCollection(), "coord_ii" );
- ( void ) new KAction( i18n( "Coordinate System III" ), "ksys3.png", 0, this, TQT_SLOT( slotCoord3() ), actionCollection(), "coord_iii" );
+ ( void ) new TDEAction( i18n( "Coordinate System I" ), "ksys1.png", 0, this, TQT_SLOT( slotCoord1() ), actionCollection(), "coord_i" );
+ ( void ) new TDEAction( i18n( "Coordinate System II" ), "ksys2.png", 0, this, TQT_SLOT( slotCoord2() ), actionCollection(), "coord_ii" );
+ ( void ) new TDEAction( i18n( "Coordinate System III" ), "ksys3.png", 0, this, TQT_SLOT( slotCoord3() ), actionCollection(), "coord_iii" );
// plot menu
- ( void ) new KAction( i18n( "&New Function Plot..." ), "newfunction", 0, this, TQT_SLOT( newFunction() ), actionCollection(), "newfunction" );
- ( void ) new KAction( i18n( "New Parametric Plot..." ), "newparametric", 0, this, TQT_SLOT( newParametric() ), actionCollection(), "newparametric" );
- ( void ) new KAction( i18n( "New Polar Plot..." ), "newpolar", 0, this, TQT_SLOT( newPolar() ), actionCollection(), "newpolar" );
- ( void ) new KAction( i18n( "Edit Plots..." ), "editplots", 0, this, TQT_SLOT( slotEditPlots() ), actionCollection(), "editplots" );
+ ( void ) new TDEAction( i18n( "&New Function Plot..." ), "newfunction", 0, this, TQT_SLOT( newFunction() ), actionCollection(), "newfunction" );
+ ( void ) new TDEAction( i18n( "New Parametric Plot..." ), "newparametric", 0, this, TQT_SLOT( newParametric() ), actionCollection(), "newparametric" );
+ ( void ) new TDEAction( i18n( "New Polar Plot..." ), "newpolar", 0, this, TQT_SLOT( newPolar() ), actionCollection(), "newpolar" );
+ ( void ) new TDEAction( i18n( "Edit Plots..." ), "editplots", 0, this, TQT_SLOT( slotEditPlots() ), actionCollection(), "editplots" );
// tools menu
- KAction *mnuYValue = new KAction( i18n( "&Get y-Value..." ), 0, this, TQT_SLOT( getYValue() ), actionCollection(), "yvalue" );
- KAction *mnuMinValue = new KAction( i18n( "&Search for Minimum Value..." ), "minimum", 0, this, TQT_SLOT( findMinimumValue() ), actionCollection(), "minimumvalue" );
- KAction *mnuMaxValue = new KAction( i18n( "&Search for Maximum Value..." ), "maximum", 0, this, TQT_SLOT( findMaximumValue() ), actionCollection(), "maximumvalue" );
- KAction *mnuArea = new KAction( i18n( "&Calculate Integral" ), 0, this, TQT_SLOT( graphArea() ), actionCollection(), "grapharea" );
+ TDEAction *mnuYValue = new TDEAction( i18n( "&Get y-Value..." ), 0, this, TQT_SLOT( getYValue() ), actionCollection(), "yvalue" );
+ TDEAction *mnuMinValue = new TDEAction( i18n( "&Search for Minimum Value..." ), "minimum", 0, this, TQT_SLOT( findMinimumValue() ), actionCollection(), "minimumvalue" );
+ TDEAction *mnuMaxValue = new TDEAction( i18n( "&Search for Maximum Value..." ), "maximum", 0, this, TQT_SLOT( findMaximumValue() ), actionCollection(), "maximumvalue" );
+ TDEAction *mnuArea = new TDEAction( i18n( "&Calculate Integral" ), 0, this, TQT_SLOT( graphArea() ), actionCollection(), "grapharea" );
connect( m_quickEdit, TQT_SIGNAL( returnPressed( const TQString& ) ), this, TQT_SLOT( slotQuickEdit( const TQString& ) ) );
KWidgetAction* quickEditAction = new KWidgetAction( m_quickEdit, i18n( "Quick Edit" ), 0, this, 0, actionCollection(), "quickedit" );
quickEditAction->setWhatsThis( i18n( "Enter a simple function equation here.\n"
"For instance: f(x)=x^2\nFor more options use Functions->Edit Plots... menu." ) );
- view->mnuSliders[0] = new KToggleAction( i18n( "Show Slider 1" ), 0, this, TQT_SLOT( toggleShowSlider0() ), actionCollection(), TQString( "options_configure_show_slider_0" ).latin1() );
- view->mnuSliders[1] = new KToggleAction( i18n( "Show Slider 2" ), 0, this, TQT_SLOT( toggleShowSlider1() ), actionCollection(), TQString( "options_configure_show_slider_1" ).latin1() );
- view->mnuSliders[2] = new KToggleAction( i18n( "Show Slider 3" ), 0, this, TQT_SLOT( toggleShowSlider2() ), actionCollection(), TQString( "options_configure_show_slider_2" ).latin1() );
- view->mnuSliders[3] = new KToggleAction( i18n( "Show Slider 4" ), 0, this, TQT_SLOT( toggleShowSlider3() ), actionCollection(), TQString( "options_configure_show_slider_3" ).latin1() );
+ view->mnuSliders[0] = new TDEToggleAction( i18n( "Show Slider 1" ), 0, this, TQT_SLOT( toggleShowSlider0() ), actionCollection(), TQString( "options_configure_show_slider_0" ).latin1() );
+ view->mnuSliders[1] = new TDEToggleAction( i18n( "Show Slider 2" ), 0, this, TQT_SLOT( toggleShowSlider1() ), actionCollection(), TQString( "options_configure_show_slider_1" ).latin1() );
+ view->mnuSliders[2] = new TDEToggleAction( i18n( "Show Slider 3" ), 0, this, TQT_SLOT( toggleShowSlider2() ), actionCollection(), TQString( "options_configure_show_slider_2" ).latin1() );
+ view->mnuSliders[3] = new TDEToggleAction( i18n( "Show Slider 4" ), 0, this, TQT_SLOT( toggleShowSlider3() ), actionCollection(), TQString( "options_configure_show_slider_3" ).latin1() );
// Popup menu
- KAction *mnuHide = new KAction(i18n("&Hide") ,0,TQT_TQOBJECT(view), TQT_SLOT( mnuHide_clicked() ),actionCollection(),"mnuhide" );
+ TDEAction *mnuHide = new TDEAction(i18n("&Hide") ,0,TQT_TQOBJECT(view), TQT_SLOT( mnuHide_clicked() ),actionCollection(),"mnuhide" );
mnuHide->plug(m_popupmenu);
- KAction *mnuRemove = new KAction(i18n("&Remove"),"editdelete", 0,TQT_TQOBJECT(view), TQT_SLOT( mnuRemove_clicked() ),actionCollection(),"mnuremove" );
+ TDEAction *mnuRemove = new TDEAction(i18n("&Remove"),"editdelete", 0,TQT_TQOBJECT(view), TQT_SLOT( mnuRemove_clicked() ),actionCollection(),"mnuremove" );
mnuRemove->plug(m_popupmenu);
- KAction *mnuEdit = new KAction(i18n("&Edit"),"editplots", 0,TQT_TQOBJECT(view), TQT_SLOT( mnuEdit_clicked() ),actionCollection(),"mnuedit" );
+ TDEAction *mnuEdit = new TDEAction(i18n("&Edit"),"editplots", 0,TQT_TQOBJECT(view), TQT_SLOT( mnuEdit_clicked() ),actionCollection(),"mnuedit" );
mnuEdit->plug(m_popupmenu);
m_popupmenu->insertSeparator();
- KAction *mnuCopy = new KAction(i18n("&Copy"), 0,TQT_TQOBJECT(view), TQT_SLOT( mnuCopy_clicked() ),actionCollection(),"mnucopy" );
+ TDEAction *mnuCopy = new TDEAction(i18n("&Copy"), 0,TQT_TQOBJECT(view), TQT_SLOT( mnuCopy_clicked() ),actionCollection(),"mnucopy" );
mnuCopy->plug(m_popupmenu);
- KAction *mnuMove = new KAction(i18n("&Move"), 0,TQT_TQOBJECT(view), TQT_SLOT( mnuMove_clicked() ),actionCollection(),"mnumove" );
+ TDEAction *mnuMove = new TDEAction(i18n("&Move"), 0,TQT_TQOBJECT(view), TQT_SLOT( mnuMove_clicked() ),actionCollection(),"mnumove" );
mnuMove->plug(m_popupmenu);
m_popupmenu->insertSeparator();
mnuYValue->plug(m_popupmenu);
diff --git a/kmplot/kmplot/MainDlg.h b/kmplot/kmplot/MainDlg.h
index 22607f62..8a34ef36 100644
--- a/kmplot/kmplot/MainDlg.h
+++ b/kmplot/kmplot/MainDlg.h
@@ -52,13 +52,13 @@
class TDEConfigDialog;
class KLineEdit;
-class KRecentFilesAction;
+class TDERecentFilesAction;
class SettingsPageColor;
class SettingsPageFonts;
class SettingsPagePrecision;
class SettingsPageScaling;
class KConstantEditor;
-class KToggleFullScreenAction;
+class TDEToggleFullScreenAction;
class BrowserExtension;
@@ -160,10 +160,10 @@ private:
/// Cached dialog to edit all functions
FktDlg *fdlg;
- /// Central widget of the KMainWindow instance. tralala
+ /// Central widget of the TDEMainWindow instance. tralala
View *view;
///The Recent Files action
- KRecentFilesAction * m_recentFiles;
+ TDERecentFilesAction * m_recentFiles;
/// true == modifications not saved
bool m_modified;
///An instance of the application config file
@@ -180,7 +180,7 @@ private:
/// A dialog used by many tools-menu-items
KMinMax *minmaxdlg;
/// the popup menu shown when cling with the right mouse button on a graph in the graph widget
- KPopupMenu *m_popupmenu;
+ TDEPopupMenu *m_popupmenu;
/// Loads and saves the user's file.
KmPlotIO *kmplotio;
/// Set to true if the application is readonly
@@ -191,7 +191,7 @@ private:
KURL m_currentfile;
/// The axes config dialogs
CoordsConfigDialog* coordsDialog;
- KRadioAction * m_mnuNoZoom;
+ TDERadioAction * m_mnuNoZoom;
protected slots:
/**
diff --git a/kmplot/kmplot/View.cpp b/kmplot/kmplot/View.cpp
index c72ba6da..1778ee9c 100644
--- a/kmplot/kmplot/View.cpp
+++ b/kmplot/kmplot/View.cpp
@@ -56,7 +56,7 @@ double View::xmin = 0;
double View::xmax = 0;
-View::View(bool const r, bool &mo, KPopupMenu *p, TQWidget* parent, const char* name ) : DCOPObject("View"), TQWidget( parent, name , WStaticContents ), buffer( width(), height() ), m_popupmenu(p), m_modified(mo), m_readonly(r), m_dcop_client(TDEApplication::kApplication()->dcopClient())
+View::View(bool const r, bool &mo, TDEPopupMenu *p, TQWidget* parent, const char* name ) : DCOPObject("View"), TQWidget( parent, name , WStaticContents ), buffer( width(), height() ), m_popupmenu(p), m_modified(mo), m_readonly(r), m_dcop_client(TDEApplication::kApplication()->dcopClient())
{
csmode = csparam = -1;
cstype = 0;
diff --git a/kmplot/kmplot/View.h b/kmplot/kmplot/View.h
index b34abf4a..6d960894 100644
--- a/kmplot/kmplot/View.h
+++ b/kmplot/kmplot/View.h
@@ -70,7 +70,7 @@ class View : public TQWidget, virtual public ViewIface
public:
/// Contructor sets up the parser, too.
- View(bool, bool &, KPopupMenu *, TQWidget* parent=NULL, const char* name=NULL );
+ View(bool, bool &, TDEPopupMenu *, TQWidget* parent=NULL, const char* name=NULL );
void setMinMaxDlg(KMinMax *);
virtual ~View();
@@ -112,7 +112,7 @@ public:
/// Slider controlling parameter values
KSliderWindow* sliders[ SLIDER_COUNT ];
/// Menu actions for the sliders
- KToggleAction *mnuSliders[ SLIDER_COUNT ];
+ TDEToggleAction *mnuSliders[ SLIDER_COUNT ];
void updateSliders(); /// show only needed sliders
public slots:
@@ -250,7 +250,7 @@ private:
///buffer the current window so all functions don't need to be re-drawed
TQPixmap buffer;
/// the popup menu
- KPopupMenu *m_popupmenu;
+ TDEPopupMenu *m_popupmenu;
/// is set to true if an integral is calculated
bool isDrawing;
///status of the popup menu
diff --git a/kmplot/kmplot/kmplot.h b/kmplot/kmplot/kmplot.h
index 3848015d..fc756f00 100644
--- a/kmplot/kmplot/kmplot.h
+++ b/kmplot/kmplot/kmplot.h
@@ -37,7 +37,7 @@
#include "kmplotIface.h"
#include "kmplotprogress.h"
-class KToggleAction;
+class TDEToggleAction;
/**
* This is the application "Shell". It has a menubar, toolbar, and
@@ -116,7 +116,7 @@ private:
private:
KParts::ReadOnlyPart *m_part;
/// The fullscreen action to be plugged/unplegged to the toolbar
- KToggleFullScreenAction* m_fullScreen;
+ TDEToggleFullScreenAction* m_fullScreen;
KmPlotProgress *m_progressbar;
};
diff --git a/kmplot/kmplot/ksliderwindow.cpp b/kmplot/kmplot/ksliderwindow.cpp
index 004a08db..9045c23f 100644
--- a/kmplot/kmplot/ksliderwindow.cpp
+++ b/kmplot/kmplot/ksliderwindow.cpp
@@ -60,10 +60,10 @@ KSliderWindow::KSliderWindow(TQWidget* parent, int num ) :
slider->installEventFilter(this);
installEventFilter(this);
- m_popupmenu = new KPopupMenu(this);
- KAction *mnuMinValue = new KAction(i18n("&Change Minimum Value") ,0,TQT_TQOBJECT(this), TQT_SLOT( mnuMinValue_clicked() ),0);
+ m_popupmenu = new TDEPopupMenu(this);
+ TDEAction *mnuMinValue = new TDEAction(i18n("&Change Minimum Value") ,0,TQT_TQOBJECT(this), TQT_SLOT( mnuMinValue_clicked() ),0);
mnuMinValue->plug(m_popupmenu);
- KAction *mnuMaxValue = new KAction(i18n("&Change Maximum Value") ,0,TQT_TQOBJECT(this), TQT_SLOT( mnuMaxValue_clicked() ),0 );
+ TDEAction *mnuMaxValue = new TDEAction(i18n("&Change Maximum Value") ,0,TQT_TQOBJECT(this), TQT_SLOT( mnuMaxValue_clicked() ),0 );
mnuMaxValue->plug(m_popupmenu);
}
diff --git a/kmplot/kmplot/ksliderwindow.h b/kmplot/kmplot/ksliderwindow.h
index cd5afae9..b221f575 100644
--- a/kmplot/kmplot/ksliderwindow.h
+++ b/kmplot/kmplot/ksliderwindow.h
@@ -52,7 +52,7 @@ class KSliderWindow : public SliderWindow
private:
bool eventFilter( TQObject *obj, TQEvent *ev );
void closeEvent( TQCloseEvent * );
- KPopupMenu *m_popupmenu;
+ TDEPopupMenu *m_popupmenu;
int m_num;
};
diff --git a/kmplot/kmplot/qconstanteditor.ui b/kmplot/kmplot/qconstanteditor.ui
index 215b4d65..29b3ecb1 100644
--- a/kmplot/kmplot/qconstanteditor.ui
+++ b/kmplot/kmplot/qconstanteditor.ui
@@ -84,7 +84,7 @@
<string>Click this button to add a new constant.</string>
</property>
</widget>
- <widget class="KListView" row="0" column="0" rowspan="5" colspan="1">
+ <widget class="TDEListView" row="0" column="0" rowspan="5" colspan="1">
<column>
<property name="text">
<string>Variable</string>
diff --git a/kmplot/kmplot/qminmax.ui b/kmplot/kmplot/qminmax.ui
index 6309a390..29a359f6 100644
--- a/kmplot/kmplot/qminmax.ui
+++ b/kmplot/kmplot/qminmax.ui
@@ -95,7 +95,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListBox" row="0" column="0">
+ <widget class="TDEListBox" row="0" column="0">
<property name="name">
<cstring>list</cstring>
</property>
diff --git a/kmplot/kmplot/qparametereditor.ui b/kmplot/kmplot/qparametereditor.ui
index d87d1784..675d2736 100644
--- a/kmplot/kmplot/qparametereditor.ui
+++ b/kmplot/kmplot/qparametereditor.ui
@@ -53,7 +53,7 @@
<string>Click here to edit the value of the selected constant. Its name cannot be changed.</string>
</property>
</widget>
- <widget class="KListBox" row="0" column="0" rowspan="8" colspan="1">
+ <widget class="TDEListBox" row="0" column="0" rowspan="8" colspan="1">
<property name="name">
<cstring>list</cstring>
</property>
diff --git a/kmplot/kmplot/settingspagefonts.ui b/kmplot/kmplot/settingspagefonts.ui
index 3ed93a8f..872a574c 100644
--- a/kmplot/kmplot/settingspagefonts.ui
+++ b/kmplot/kmplot/settingspagefonts.ui
@@ -82,7 +82,7 @@
<cstring>kcfg_AxesFont</cstring>
</property>
</widget>
- <widget class="KFontCombo" row="0" column="1" rowspan="1" colspan="2">
+ <widget class="TDEFontCombo" row="0" column="1" rowspan="1" colspan="2">
<property name="name">
<cstring>kcfg_AxesFont</cstring>
</property>
@@ -104,7 +104,7 @@
<string>Here you set the font size for the axis</string>
</property>
</widget>
- <widget class="KFontCombo" row="2" column="1" rowspan="1" colspan="2">
+ <widget class="TDEFontCombo" row="2" column="1" rowspan="1" colspan="2">
<property name="name">
<cstring>kcfg_HeaderTableFont</cstring>
</property>
diff --git a/kstars/kstars/addcatdialogui.ui b/kstars/kstars/addcatdialogui.ui
index 266cbefb..6dc67273 100644
--- a/kstars/kstars/addcatdialogui.ui
+++ b/kstars/kstars/addcatdialogui.ui
@@ -41,7 +41,7 @@
<string>To import an existing data file, enter its filename here. You will then describe the contents of the file below. You can leave the filename blank to construct a catalog file with a valid header, but no data.</string>
</property>
</widget>
- <widget class="KListBox">
+ <widget class="TDEListBox">
<property name="name">
<cstring>DataFileBox</cstring>
</property>
diff --git a/kstars/kstars/details_database.ui b/kstars/kstars/details_database.ui
index 51dd7e3c..04e4c150 100644
--- a/kstars/kstars/details_database.ui
+++ b/kstars/kstars/details_database.ui
@@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListView">
+ <widget class="TDEListView">
<column>
<property name="text">
<string>Choose Online Database</string>
diff --git a/kstars/kstars/details_links.ui b/kstars/kstars/details_links.ui
index 3b2a7bb2..c75c52dc 100644
--- a/kstars/kstars/details_links.ui
+++ b/kstars/kstars/details_links.ui
@@ -43,7 +43,7 @@
<string>&lt;p align="center"&gt;Information Links&lt;/p&gt;</string>
</property>
</widget>
- <widget class="KListBox">
+ <widget class="TDEListBox">
<property name="name">
<cstring>InfoList</cstring>
</property>
@@ -97,7 +97,7 @@
<string>&lt;p align="center"&gt;Image Links&lt;/p&gt;</string>
</property>
</widget>
- <widget class="KListBox">
+ <widget class="TDEListBox">
<property name="name">
<cstring>ImagesList</cstring>
</property>
diff --git a/kstars/kstars/devmanager.ui b/kstars/kstars/devmanager.ui
index 3755d1da..97541c44 100644
--- a/kstars/kstars/devmanager.ui
+++ b/kstars/kstars/devmanager.ui
@@ -37,7 +37,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListView">
+ <widget class="TDEListView">
<column>
<property name="text">
<string>Device</string>
@@ -238,7 +238,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListView">
+ <widget class="TDEListView">
<column>
<property name="text">
<string>Status</string>
diff --git a/kstars/kstars/draglistbox.cpp b/kstars/kstars/draglistbox.cpp
index 74cd169f..f7ea9251 100644
--- a/kstars/kstars/draglistbox.cpp
+++ b/kstars/kstars/draglistbox.cpp
@@ -22,7 +22,7 @@
#include "draglistbox.h"
DragListBox::DragListBox( TQWidget *parent, const char *name, WFlags f )
- : KListBox( parent, name, f ) {
+ : TDEListBox( parent, name, f ) {
setAcceptDrops( TRUE );
dragging = FALSE;
diff --git a/kstars/kstars/draglistbox.h b/kstars/kstars/draglistbox.h
index 880c63db..1786961e 100644
--- a/kstars/kstars/draglistbox.h
+++ b/kstars/kstars/draglistbox.h
@@ -24,13 +24,13 @@ class TQDragEnterEvent;
class TQDragDropEvent;
/**@class DragListBox
- *@short Extension of KListBox that allows Drag-and-Drop
+ *@short Extension of TDEListBox that allows Drag-and-Drop
*with other DragListBoxes
*@author Jason Harris
*@version 1.0
*/
-class DragListBox : public KListBox {
+class DragListBox : public TDEListBox {
Q_OBJECT
public:
diff --git a/kstars/kstars/fitsheaderdialog.ui b/kstars/kstars/fitsheaderdialog.ui
index 7903b000..18c6e723 100644
--- a/kstars/kstars/fitsheaderdialog.ui
+++ b/kstars/kstars/fitsheaderdialog.ui
@@ -22,7 +22,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListView" row="0" column="0" rowspan="1" colspan="5">
+ <widget class="TDEListView" row="0" column="0" rowspan="1" colspan="5">
<column>
<property name="text">
<string>Card</string>
diff --git a/kstars/kstars/fitsviewer.cpp b/kstars/kstars/fitsviewer.cpp
index e5e510bd..b9c8c03f 100644
--- a/kstars/kstars/fitsviewer.cpp
+++ b/kstars/kstars/fitsviewer.cpp
@@ -92,7 +92,7 @@ extern int fits_ieee64_motorola;
val = *(FITS_BITPIXM64 *)uc; } else val = *(FITS_BITPIXM64 *)p; }
FITSViewer::FITSViewer (const KURL *url, TQWidget *parent, const char *name)
- : KMainWindow (parent, name)
+ : TDEMainWindow (parent, name)
{
image = NULL;
currentURL = *url;
@@ -131,27 +131,27 @@ FITSViewer::FITSViewer (const KURL *url, TQWidget *parent, const char *name)
if (KSUtils::openDataFile( tempFile, "imgreduction.png" ) )
{
- new KAction( i18n("Image Reduction"), tempFile.name(), KShortcut( "Ctrl+R" ), TQT_TQOBJECT(this), TQT_SLOT( imageReduction()), actionCollection(), "image_reduce");
+ new TDEAction( i18n("Image Reduction"), tempFile.name(), TDEShortcut( "Ctrl+R" ), TQT_TQOBJECT(this), TQT_SLOT( imageReduction()), actionCollection(), "image_reduce");
tempFile.close();
}
else
- new KAction( i18n("Image Reduction"), "blend", KShortcut( "Ctrl+R" ), TQT_TQOBJECT(this), TQT_SLOT( imageReduction()), actionCollection(), "image_reduce");
+ new TDEAction( i18n("Image Reduction"), "blend", TDEShortcut( "Ctrl+R" ), TQT_TQOBJECT(this), TQT_SLOT( imageReduction()), actionCollection(), "image_reduce");
/*if (KSUtils::openDataFile( tempFile, "bricon.png" ) )
{
- new KAction( i18n("Brightness/Contrast"), tempFile.name(), KShortcut( "Ctrl+T" ), TQT_TQOBJECT(this), TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast");
+ new TDEAction( i18n("Brightness/Contrast"), tempFile.name(), TDEShortcut( "Ctrl+T" ), TQT_TQOBJECT(this), TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast");
tempFile.close();
}
else*/
- new KAction( i18n("Brightness/Contrast"), "contrast+", KShortcut( "Ctrl+T" ), TQT_TQOBJECT(this), TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast");
+ new TDEAction( i18n("Brightness/Contrast"), "contrast+", TDEShortcut( "Ctrl+T" ), TQT_TQOBJECT(this), TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast");
if (KSUtils::openDataFile( tempFile, "histogram.png" ) )
{
- new KAction ( i18n("Histogram"), tempFile.name(), KShortcut("Ctrl+H"), TQT_TQOBJECT(this), TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram");
+ new TDEAction ( i18n("Histogram"), tempFile.name(), TDEShortcut("Ctrl+H"), TQT_TQOBJECT(this), TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram");
tempFile.close();
}
else
- new KAction ( i18n("Histogram"), "wizard", KShortcut("Ctrl+H"), TQT_TQOBJECT(this), TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram");
+ new TDEAction ( i18n("Histogram"), "wizard", TDEShortcut("Ctrl+H"), TQT_TQOBJECT(this), TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram");
KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection());
@@ -160,10 +160,10 @@ FITSViewer::FITSViewer (const KURL *url, TQWidget *parent, const char *name)
KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(fitsCOPY()), actionCollection());
KStdAction::zoomIn(TQT_TQOBJECT(image), TQT_SLOT(fitsZoomIn()), actionCollection());
KStdAction::zoomOut(TQT_TQOBJECT(image), TQT_SLOT(fitsZoomOut()), actionCollection());
- new KAction( i18n( "&Default Zoom" ), "viewmagfit.png", KShortcut( "Ctrl+D" ),
+ new TDEAction( i18n( "&Default Zoom" ), "viewmagfit.png", TDEShortcut( "Ctrl+D" ),
TQT_TQOBJECT(image), TQT_SLOT(fitsZoomDefault()), actionCollection(), "zoom_default" );
- new KAction( i18n( "Statistics"), "sum", 0, TQT_TQOBJECT(this), TQT_SLOT(fitsStatistics()), actionCollection(), "image_stats");
- new KAction( i18n( "FITS Header"), "frame_spreadsheet.png", 0, TQT_TQOBJECT(this), TQT_SLOT(fitsHeader()), actionCollection(), "fits_editor");
+ new TDEAction( i18n( "Statistics"), "sum", 0, TQT_TQOBJECT(this), TQT_SLOT(fitsStatistics()), actionCollection(), "image_stats");
+ new TDEAction( i18n( "FITS Header"), "frame_spreadsheet.png", 0, TQT_TQOBJECT(this), TQT_SLOT(fitsHeader()), actionCollection(), "fits_editor");
/* Create GUI */
createGUI("fitsviewer.rc");
diff --git a/kstars/kstars/fitsviewer.h b/kstars/kstars/fitsviewer.h
index 3790ebf1..ee3c7a7c 100644
--- a/kstars/kstars/fitsviewer.h
+++ b/kstars/kstars/fitsviewer.h
@@ -45,7 +45,7 @@ class TQScrollView;
class FITSImage;
class FITSHistogram;
-class FITSViewer : public KMainWindow {
+class FITSViewer : public TDEMainWindow {
Q_OBJECT
diff --git a/kstars/kstars/fovdialogui.ui b/kstars/kstars/fovdialogui.ui
index 77f10219..f114266d 100644
--- a/kstars/kstars/fovdialogui.ui
+++ b/kstars/kstars/fovdialogui.ui
@@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListBox">
+ <widget class="TDEListBox">
<property name="name">
<cstring>FOVListBox</cstring>
</property>
diff --git a/kstars/kstars/imageviewer.cpp b/kstars/kstars/imageviewer.cpp
index d3b92722..8fdbacbc 100644
--- a/kstars/kstars/imageviewer.cpp
+++ b/kstars/kstars/imageviewer.cpp
@@ -30,16 +30,16 @@
#include <kapplication.h>
ImageViewer::ImageViewer (const KURL *url, const TQString &capText, TQWidget *parent, const char *name)
- : KMainWindow (parent, name), imageURL (*url), fileIsImage (false),
+ : TDEMainWindow (parent, name), imageURL (*url), fileIsImage (false),
ctrl (false), key_s (false), key_q (false), downloadJob(0)
{
// toolbar can dock only on top-position and can't be minimized
// JH: easier to just disable its mobility
toolBar()->setMovingEnabled( false );
- KAction *action = new KAction (i18n ("Close Window"), "fileclose", CTRL+Key_Q, TQT_TQOBJECT(this), TQT_SLOT (close()), actionCollection());
+ TDEAction *action = new TDEAction (i18n ("Close Window"), "fileclose", CTRL+Key_Q, TQT_TQOBJECT(this), TQT_SLOT (close()), actionCollection());
action->plug (toolBar());
- action = new KAction (i18n ("Save Image"), "filesave", CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT (saveFileToDisc()), actionCollection());
+ action = new TDEAction (i18n ("Save Image"), "filesave", CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT (saveFileToDisc()), actionCollection());
action->plug (toolBar());
statusBar()->insertItem( capText, 0, 1, true );
diff --git a/kstars/kstars/imageviewer.h b/kstars/kstars/imageviewer.h
index cec0d85f..e0b085e9 100644
--- a/kstars/kstars/imageviewer.h
+++ b/kstars/kstars/imageviewer.h
@@ -45,7 +45,7 @@
class KURL;
class TQFile;
-class ImageViewer : public KMainWindow {
+class ImageViewer : public TDEMainWindow {
Q_OBJECT
@@ -70,7 +70,7 @@ class ImageViewer : public KMainWindow {
void closeEvent (TQCloseEvent *ev);
/**Keyboard shortcuts for saving files and closing the window
- *@note (this should be deprecated; instead just assign KAccel
+ *@note (this should be deprecated; instead just assign TDEAccel
*to the close/save buttons)
*/
void keyPressEvent (TQKeyEvent *ev);
diff --git a/kstars/kstars/indidevice.h b/kstars/kstars/indidevice.h
index 11ed7cf3..366e7b3a 100644
--- a/kstars/kstars/indidevice.h
+++ b/kstars/kstars/indidevice.h
@@ -31,7 +31,7 @@ class KLineEdit;
class KComboBox;
class KDoubleSpinBox;
class KPushButton;
-class KPopupMenu;
+class TDEPopupMenu;
class TQTable;
class TQLabel;
diff --git a/kstars/kstars/indidriver.cpp b/kstars/kstars/indidriver.cpp
index e34b83f6..1de1b3ea 100644
--- a/kstars/kstars/indidriver.cpp
+++ b/kstars/kstars/indidriver.cpp
@@ -69,7 +69,7 @@ INDIDriver::INDIDriver(TQWidget *parent) : devManager( parent )
localMode = icons->loadIcon( "network_local", KIcon::Small);
serverMode = icons->loadIcon( "network", KIcon::Small);
- LocalpopMenu = new KPopupMenu(localListView);
+ LocalpopMenu = new TDEPopupMenu(localListView);
LocalpopMenu->insertItem( runningPix, i18n("Run Service") , 0);
LocalpopMenu->insertItem( stopPix, i18n("Stop Service"), 1);
@@ -79,7 +79,7 @@ INDIDriver::INDIDriver(TQWidget *parent) : devManager( parent )
disconnected = icons->loadIcon( "connect_no", KIcon::Small);
establishConnection = icons->loadIcon( "connect_creating", KIcon::Small);
- ClientpopMenu = new KPopupMenu(clientListView);
+ ClientpopMenu = new TDEPopupMenu(clientListView);
ClientpopMenu->insertItem( establishConnection, i18n("Connect") , 0);
ClientpopMenu->insertItem( disconnected, i18n("Disconnect"), 1);
@@ -353,7 +353,7 @@ void INDIDriver::updateMenuActions()
// We iterate over devices, we enable INDI Control Panel if we have any active device
// We enable capture image sequence if we have any imaging device
- KAction *tmpAction;
+ TDEAction *tmpAction;
INDIMenu *devMenu = ksw->getINDIMenu();
bool activeDevice = false;
bool activeImaging = false;
@@ -656,7 +656,7 @@ bool INDIDriver::buildDeviceGroup(XMLEle *root, char errmsg[])
groupType = KSTARS_GPS;
- //KListViewItem *group = new KListViewItem(topItem, lastGroup);
+ //TDEListViewItem *group = new TDEListViewItem(topItem, lastGroup);
TQListViewItem *group = new TQListViewItem(localListView, lastGroup);
group->setText(0, groupName);
lastGroup = group;
diff --git a/kstars/kstars/indidriver.h b/kstars/kstars/indidriver.h
index 8ecf6e2e..617d89de 100644
--- a/kstars/kstars/indidriver.h
+++ b/kstars/kstars/indidriver.h
@@ -27,8 +27,8 @@
class KStars;
-class KListView;
-class KPopupMenu;
+class TDEListView;
+class TDEPopupMenu;
class TDEProcess;
struct INDIHostsInfo
@@ -87,7 +87,7 @@ class INDIDriver : public devManager
INDIDriver(TQWidget * parent = 0);
~INDIDriver();
- KListView* deviceContainer;
+ TDEListView* deviceContainer;
bool readXMLDriver();
@@ -108,8 +108,8 @@ class INDIDriver : public devManager
TQPixmap localMode;
TQPixmap serverMode;
- KPopupMenu *ClientpopMenu;
- KPopupMenu *LocalpopMenu;
+ TDEPopupMenu *ClientpopMenu;
+ TDEPopupMenu *LocalpopMenu;
int lastPort;
diff --git a/kstars/kstars/indiproperty.h b/kstars/kstars/indiproperty.h
index 836f02f7..c655903a 100644
--- a/kstars/kstars/indiproperty.h
+++ b/kstars/kstars/indiproperty.h
@@ -18,7 +18,7 @@
class INDI_G;
class INDIStdProperty;
-class KPopupMenu;
+class TDEPopupMenu;
class KComboBox;
class KLed;
@@ -43,7 +43,7 @@ class INDI_P : public TQObject
TQString label; /* property label */
INDI_G *pg; /* parent group */
- KPopupMenu *assosiatedPopup; /* assosiated popup menu, if any */
+ TDEPopupMenu *assosiatedPopup; /* assosiated popup menu, if any */
INDIStdProperty *indistd; /* Assosciated std routines class */
double timeout; /* timeout, seconds */
PState state; /* state light code */
diff --git a/kstars/kstars/indistd.cpp b/kstars/kstars/indistd.cpp
index c79b90eb..debf946c 100644
--- a/kstars/kstars/indistd.cpp
+++ b/kstars/kstars/indistd.cpp
@@ -345,7 +345,7 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d
{
INDI_E *lp;
INDI_P *imgProp;
- KAction *tmpAction;
+ TDEAction *tmpAction;
INDIDriver *drivers = ksw->getINDIDriver();
TQFont buttonFont;
diff --git a/kstars/kstars/kspopupmenu.cpp b/kstars/kstars/kspopupmenu.cpp
index 94e25708..80125fbe 100644
--- a/kstars/kstars/kspopupmenu.cpp
+++ b/kstars/kstars/kspopupmenu.cpp
@@ -33,7 +33,7 @@
#include "indiproperty.h"
KSPopupMenu::KSPopupMenu( TQWidget *parent, const char *name )
- : KPopupMenu( parent, name )
+ : TDEPopupMenu( parent, name )
{
ksw = ( KStars* )parent;
}
@@ -154,7 +154,7 @@ bool KSPopupMenu::addINDI(void)
if (!dev->INDIStdSupport)
continue;
- KPopupMenu *menuDevice = new KPopupMenu();
+ TDEPopupMenu *menuDevice = new TDEPopupMenu();
insertItem(dev->label, menuDevice);
diff --git a/kstars/kstars/kspopupmenu.h b/kstars/kstars/kspopupmenu.h
index 3262a2aa..6dd9b143 100644
--- a/kstars/kstars/kspopupmenu.h
+++ b/kstars/kstars/kspopupmenu.h
@@ -36,7 +36,7 @@ class StarObject;
class SkyObject;
class TQLabel;
-class KSPopupMenu : public KPopupMenu
+class KSPopupMenu : public TDEPopupMenu
{
Q_OBJECT
diff --git a/kstars/kstars/kstars.cpp b/kstars/kstars/kstars.cpp
index 93c01717..c57eec64 100644
--- a/kstars/kstars/kstars.cpp
+++ b/kstars/kstars/kstars.cpp
@@ -16,7 +16,7 @@
***************************************************************************/
//JH 11.06.2002: replaced infoPanel with infoBoxes
//JH 24.08.2001: reorganized infoPanel
-//JH 25.08.2001: added toolbar, converted menu items to KAction objects
+//JH 25.08.2001: added toolbar, converted menu items to TDEAction objects
//JH 25.08.2001: main window now resizable, window size saved in config file
@@ -47,7 +47,7 @@
#include "indidriver.h"
KStars::KStars( bool doSplash, bool clockrun, const TQString &startdate ) :
- DCOPObject("KStarsInterface"), KMainWindow(),
+ DCOPObject("KStarsInterface"), TDEMainWindow(),
skymap(0), centralWidget(0), topLayout(0), viewToolBar(0), TimeStep(0),
actCoordSys(0), colorActionMenu(0), fovActionMenu(0),
AAVSODialog(0), findDialog(0), kns(0),
@@ -163,23 +163,23 @@ void KStars::applyConfig() {
//Toggle actions
if ( Options::useAltAz() ) ((ToggleAction*)actionCollection()->action("coordsys"))->turnOff();
- ((KToggleAction*)actionCollection()->action("show_time_box"))->setChecked( Options::showTimeBox() );
- ((KToggleAction*)actionCollection()->action("show_location_box"))->setChecked( Options::showGeoBox() );
- ((KToggleAction*)actionCollection()->action("show_focus_box"))->setChecked( Options::showFocusBox() );
- ((KToggleAction*)actionCollection()->action("show_mainToolBar"))->setChecked( Options::showMainToolBar() );
- ((KToggleAction*)actionCollection()->action("show_viewToolBar"))->setChecked( Options::showViewToolBar() );
- ((KToggleAction*)actionCollection()->action("show_statusBar"))->setChecked( Options::showStatusBar() );
- ((KToggleAction*)actionCollection()->action("show_sbAzAlt"))->setChecked( Options::showAltAzField() );
- ((KToggleAction*)actionCollection()->action("show_sbRADec"))->setChecked( Options::showRADecField() );
- ((KToggleAction*)actionCollection()->action("show_stars"))->setChecked( Options::showStars() );
- ((KToggleAction*)actionCollection()->action("show_deepsky"))->setChecked( Options::showDeepSky() );
- ((KToggleAction*)actionCollection()->action("show_planets"))->setChecked( Options::showPlanets() );
- ((KToggleAction*)actionCollection()->action("show_clines"))->setChecked( Options::showCLines() );
- ((KToggleAction*)actionCollection()->action("show_cnames"))->setChecked( Options::showCNames() );
- ((KToggleAction*)actionCollection()->action("show_cbounds"))->setChecked( Options::showCBounds() );
- ((KToggleAction*)actionCollection()->action("show_mw"))->setChecked( Options::showMilkyWay() );
- ((KToggleAction*)actionCollection()->action("show_grid"))->setChecked( Options::showGrid() );
- ((KToggleAction*)actionCollection()->action("show_horizon"))->setChecked( Options::showGround() );
+ ((TDEToggleAction*)actionCollection()->action("show_time_box"))->setChecked( Options::showTimeBox() );
+ ((TDEToggleAction*)actionCollection()->action("show_location_box"))->setChecked( Options::showGeoBox() );
+ ((TDEToggleAction*)actionCollection()->action("show_focus_box"))->setChecked( Options::showFocusBox() );
+ ((TDEToggleAction*)actionCollection()->action("show_mainToolBar"))->setChecked( Options::showMainToolBar() );
+ ((TDEToggleAction*)actionCollection()->action("show_viewToolBar"))->setChecked( Options::showViewToolBar() );
+ ((TDEToggleAction*)actionCollection()->action("show_statusBar"))->setChecked( Options::showStatusBar() );
+ ((TDEToggleAction*)actionCollection()->action("show_sbAzAlt"))->setChecked( Options::showAltAzField() );
+ ((TDEToggleAction*)actionCollection()->action("show_sbRADec"))->setChecked( Options::showRADecField() );
+ ((TDEToggleAction*)actionCollection()->action("show_stars"))->setChecked( Options::showStars() );
+ ((TDEToggleAction*)actionCollection()->action("show_deepsky"))->setChecked( Options::showDeepSky() );
+ ((TDEToggleAction*)actionCollection()->action("show_planets"))->setChecked( Options::showPlanets() );
+ ((TDEToggleAction*)actionCollection()->action("show_clines"))->setChecked( Options::showCLines() );
+ ((TDEToggleAction*)actionCollection()->action("show_cnames"))->setChecked( Options::showCNames() );
+ ((TDEToggleAction*)actionCollection()->action("show_cbounds"))->setChecked( Options::showCBounds() );
+ ((TDEToggleAction*)actionCollection()->action("show_mw"))->setChecked( Options::showMilkyWay() );
+ ((TDEToggleAction*)actionCollection()->action("show_grid"))->setChecked( Options::showGrid() );
+ ((TDEToggleAction*)actionCollection()->action("show_horizon"))->setChecked( Options::showGround() );
//color scheme
pd->kstarsData->colorScheme()->loadFromConfig( kapp->config() );
diff --git a/kstars/kstars/kstars.h b/kstars/kstars/kstars.h
index 0a5c3dee..3e719742 100644
--- a/kstars/kstars/kstars.h
+++ b/kstars/kstars/kstars.h
@@ -32,10 +32,10 @@
// forward declaration is enough. We only need pointers
class TQPalette;
class TQVBoxLayout;
-class KActionMenu;
+class TDEActionMenu;
class KDialogBase;
class KKey;
-class KToolBar;
+class TDEToolBar;
class dms;
class KSNewStuff;
@@ -64,7 +64,7 @@ class imagesequence;
*@version 1.0
*/
-class KStars : public KMainWindow, virtual public KStarsInterface
+class KStars : public TDEMainWindow, virtual public KStarsInterface
{
Q_OBJECT
@@ -634,12 +634,12 @@ class KStars : public KMainWindow, virtual public KStarsInterface
TQWidget *centralWidget;
TQVBoxLayout *topLayout;
- KToolBar *viewToolBar;
+ TDEToolBar *viewToolBar;
TimeStepBox *TimeStep;
ToggleAction *actCoordSys;
ToggleAction *actObsList;
- KActionMenu *colorActionMenu, *fovActionMenu;
+ TDEActionMenu *colorActionMenu, *fovActionMenu;
KDialogBase *AAVSODialog;
FindDialog *findDialog;
diff --git a/kstars/kstars/kstarsactions.cpp b/kstars/kstars/kstarsactions.cpp
index aa403e9b..133d5fab 100644
--- a/kstars/kstars/kstarsactions.cpp
+++ b/kstars/kstars/kstarsactions.cpp
@@ -873,7 +873,7 @@ void KStars::slotFOVEdit() {
if ( fields.count() == 4 ) {
TQString nm = fields[0].stripWhiteSpace();
- KToggleAction *kta = new KToggleAction( nm, 0, TQT_TQOBJECT(this), TQT_SLOT( slotTargetSymbol() ),
+ TDEToggleAction *kta = new TDEToggleAction( nm, 0, TQT_TQOBJECT(this), TQT_SLOT( slotTargetSymbol() ),
actionCollection(), nm.utf8() );
kta->setExclusiveGroup( "fovsymbol" );
fovActionMenu->insert( kta );
@@ -884,7 +884,7 @@ void KStars::slotFOVEdit() {
}
fovActionMenu->popupMenu()->insertSeparator();
- fovActionMenu->insert( new KAction( i18n( "Edit FOV Symbols..." ), 0, TQT_TQOBJECT(this),
+ fovActionMenu->insert( new TDEAction( i18n( "Edit FOV Symbols..." ), 0, TQT_TQOBJECT(this),
TQT_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) );
//set FOV to whatever was highlighted in FOV dialog
@@ -1019,7 +1019,7 @@ void KStars::slotShowGUIItem( bool show ) {
}
void KStars::addColorMenuItem( TQString name, TQString actionName ) {
- colorActionMenu->insert( new KAction( name, 0,
+ colorActionMenu->insert( new TDEAction( name, 0,
TQT_TQOBJECT(this), TQT_SLOT( slotColorScheme() ), actionCollection(), actionName.local8Bit() ) );
}
diff --git a/kstars/kstars/kstarsinit.cpp b/kstars/kstars/kstarsinit.cpp
index c0248238..4db3b995 100644
--- a/kstars/kstars/kstarsinit.cpp
+++ b/kstars/kstars/kstarsinit.cpp
@@ -48,24 +48,24 @@
void KStars::initActions() {
//File Menu:
- new KAction(i18n("&New Window"), "window_new", KShortcut( "Ctrl+N" ),
+ new TDEAction(i18n("&New Window"), "window_new", TDEShortcut( "Ctrl+N" ),
TQT_TQOBJECT(this), TQT_SLOT( newWindow() ), actionCollection(), "new_window");
- new KAction(i18n("&Close Window"), "fileclose", KShortcut( "Ctrl+W" ),
+ new TDEAction(i18n("&Close Window"), "fileclose", TDEShortcut( "Ctrl+W" ),
TQT_TQOBJECT(this), TQT_SLOT( closeWindow() ), actionCollection(), "close_window");
- new KAction( i18n( "&Download Data..." ), "knewstuff", KShortcut( "Ctrl+D" ),
+ new TDEAction( i18n( "&Download Data..." ), "knewstuff", TDEShortcut( "Ctrl+D" ),
TQT_TQOBJECT(this), TQT_SLOT( slotDownload() ), actionCollection(), "get_data" );
- new KAction( i18n( "Open FITS..."), "fileopen", KShortcut( "Ctrl+O"), TQT_TQOBJECT(this), TQT_SLOT( slotOpenFITS()), actionCollection(), "open_file");
- new KAction( i18n( "&Save Sky Image..." ), "fileexport", KShortcut( "Ctrl+I" ),
+ new TDEAction( i18n( "Open FITS..."), "fileopen", TDEShortcut( "Ctrl+O"), TQT_TQOBJECT(this), TQT_SLOT( slotOpenFITS()), actionCollection(), "open_file");
+ new TDEAction( i18n( "&Save Sky Image..." ), "fileexport", TDEShortcut( "Ctrl+I" ),
TQT_TQOBJECT(this), TQT_SLOT( slotExportImage() ), actionCollection(), "export_image" );
- new KAction( i18n( "&Run Script..." ), "launch", KShortcut( "Ctrl+R" ),
+ new TDEAction( i18n( "&Run Script..." ), "launch", TDEShortcut( "Ctrl+R" ),
TQT_TQOBJECT(this), TQT_SLOT( slotRunScript() ), actionCollection(), "run_script" );
KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ), actionCollection(), "print" );
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "quit" );
//Time Menu:
- new KAction( i18n( "Set Time to &Now" ), KShortcut( "Ctrl+E" ),
+ new TDEAction( i18n( "Set Time to &Now" ), TDEShortcut( "Ctrl+E" ),
TQT_TQOBJECT(this), TQT_SLOT( slotSetTimeToNow() ), actionCollection(), "time_to_now" );
- new KAction( i18n( "set Clock to New Time", "&Set Time..." ), "clock", KShortcut( "Ctrl+S" ),
+ new TDEAction( i18n( "set Clock to New Time", "&Set Time..." ), "clock", TDEShortcut( "Ctrl+S" ),
TQT_TQOBJECT(this), TQT_SLOT( slotSetTime() ), actionCollection(), "time_dialog" );
ToggleAction *actTimeRun = new ToggleAction( i18n( "Stop &Clock" ), BarIcon("player_pause"),
i18n("Start &Clock"), BarIcon("1rightarrow"),
@@ -78,33 +78,33 @@ void KStars::initActions() {
TQObject::connect(data()->clock(), TQT_SIGNAL(clockStopped()), this, TQT_SLOT(updateTime()) );
//Focus Menu:
- new KAction(i18n( "&Zenith" ), KShortcut( "Z" ),
+ new TDEAction(i18n( "&Zenith" ), TDEShortcut( "Z" ),
TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "zenith");
- new KAction(i18n( "&North" ), KShortcut( "N" ),
+ new TDEAction(i18n( "&North" ), TDEShortcut( "N" ),
TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "north");
- new KAction(i18n( "&East" ), KShortcut( "E" ),
+ new TDEAction(i18n( "&East" ), TDEShortcut( "E" ),
TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "east");
- new KAction(i18n( "&South" ), KShortcut( "S" ),
+ new TDEAction(i18n( "&South" ), TDEShortcut( "S" ),
TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "south");
- new KAction(i18n( "&West" ), KShortcut( "W" ),
+ new TDEAction(i18n( "&West" ), TDEShortcut( "W" ),
TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "west");
- KAction *tmpAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( slotFind() ),
+ TDEAction *tmpAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( slotFind() ),
actionCollection(), "find_object" );
tmpAction->setText( i18n( "&Find Object..." ) );
tmpAction->setToolTip( i18n( "Find object" ) );
- new KAction( i18n( "Engage &Tracking" ), "decrypted", KShortcut( "Ctrl+T" ),
+ new TDEAction( i18n( "Engage &Tracking" ), "decrypted", TDEShortcut( "Ctrl+T" ),
TQT_TQOBJECT(this), TQT_SLOT( slotTrack() ), actionCollection(), "track_object" );
- new KAction( i18n( "Set Focus &Manually..." ), KShortcut( "Ctrl+M" ),
+ new TDEAction( i18n( "Set Focus &Manually..." ), TDEShortcut( "Ctrl+M" ),
TQT_TQOBJECT(this), TQT_SLOT( slotManualFocus() ), actionCollection(), "manual_focus" );
//View Menu:
KStdAction::zoomIn(TQT_TQOBJECT(this), TQT_SLOT( slotZoomIn() ), actionCollection(), "zoom_in" );
KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT( slotZoomOut() ), actionCollection(), "zoom_out" );
- new KAction( i18n( "&Default Zoom" ), "viewmagfit.png", KShortcut( "Ctrl+Z" ),
+ new TDEAction( i18n( "&Default Zoom" ), "viewmagfit.png", TDEShortcut( "Ctrl+Z" ),
TQT_TQOBJECT(this), TQT_SLOT( slotDefaultZoom() ), actionCollection(), "zoom_default" );
- new KAction( i18n( "&Zoom to Angular Size..." ), "viewmag.png", KShortcut( "Ctrl+Shift+Z" ),
+ new TDEAction( i18n( "&Zoom to Angular Size..." ), "viewmag.png", TDEShortcut( "Ctrl+Shift+Z" ),
TQT_TQOBJECT(this), TQT_SLOT( slotSetZoom() ), actionCollection(), "zoom_set" );
actCoordSys = new ToggleAction( i18n("Horizontal &Coordinates"), i18n( "Equatorial &Coordinates" ),
Key_Space, TQT_TQOBJECT(this), TQT_SLOT( slotCoordSys() ), actionCollection(), "coordsys" );
@@ -114,56 +114,56 @@ void KStars::initActions() {
//Settings Menu:
//
// MHH - 2002-01-13
- // Setting the slot in the KToggleAction constructor, connects the slot to
+ // Setting the slot in the TDEToggleAction constructor, connects the slot to
// the activated signal instead of the toggled signal. This seems like a bug
// to me, but ...
//
//Info Boxes option actions
- KToggleAction *a = new KToggleAction(i18n( "Show the information boxes", "Show &Info Boxes"),
+ TDEToggleAction *a = new TDEToggleAction(i18n( "Show the information boxes", "Show &Info Boxes"),
0, 0, 0, actionCollection(), "show_boxes");
a->setChecked( Options::showInfoBoxes() );
TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), infoBoxes(), TQT_SLOT(setVisible(bool)));
TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool)));
- a = new KToggleAction(i18n( "Show time-related info box", "Show &Time Box"),
+ a = new TDEToggleAction(i18n( "Show time-related info box", "Show &Time Box"),
0, 0, 0, actionCollection(), "show_time_box");
TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), infoBoxes(), TQT_SLOT(showTimeBox(bool)));
TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool)));
- a = new KToggleAction(i18n( "Show focus-related info box", "Show &Focus Box"),
+ a = new TDEToggleAction(i18n( "Show focus-related info box", "Show &Focus Box"),
0, 0, 0, actionCollection(), "show_focus_box");
TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), infoBoxes(), TQT_SLOT(showFocusBox(bool)));
TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool)));
- a = new KToggleAction(i18n( "Show location-related info box", "Show &Location Box"),
+ a = new TDEToggleAction(i18n( "Show location-related info box", "Show &Location Box"),
0, 0, 0, actionCollection(), "show_location_box");
TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), infoBoxes(), TQT_SLOT(showGeoBox(bool)));
TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool)));
//Toolbar view options
- a = new KToggleAction(i18n( "Show Main Toolbar" ),
+ a = new TDEToggleAction(i18n( "Show Main Toolbar" ),
0, 0, 0, actionCollection(), "show_mainToolBar");
TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool)));
- a = new KToggleAction(i18n( "Show View Toolbar" ),
+ a = new TDEToggleAction(i18n( "Show View Toolbar" ),
0, 0, 0, actionCollection(), "show_viewToolBar");
TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool)));
//Statusbar view options
- a = new KToggleAction(i18n( "Show Statusbar" ),
+ a = new TDEToggleAction(i18n( "Show Statusbar" ),
0, 0, 0, actionCollection(), "show_statusBar");
TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool)));
- a = new KToggleAction(i18n( "Show Az/Alt Field" ),
+ a = new TDEToggleAction(i18n( "Show Az/Alt Field" ),
0, 0, 0, actionCollection(), "show_sbAzAlt");
TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool)));
- a = new KToggleAction(i18n( "Show RA/Dec Field" ),
+ a = new TDEToggleAction(i18n( "Show RA/Dec Field" ),
0, 0, 0, actionCollection(), "show_sbRADec");
TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool)));
-//Color scheme actions. These are added to the "colorschemes" KActionMenu.
- colorActionMenu = new KActionMenu( i18n( "C&olor Schemes" ), actionCollection(), "colorschemes" );
+//Color scheme actions. These are added to the "colorschemes" TDEActionMenu.
+ colorActionMenu = new TDEActionMenu( i18n( "C&olor Schemes" ), actionCollection(), "colorschemes" );
addColorMenuItem( i18n( "&Default" ), "cs_default" );
addColorMenuItem( i18n( "&Star Chart" ), "cs_chart" );
addColorMenuItem( i18n( "&Night Vision" ), "cs_night" );
@@ -187,65 +187,65 @@ void KStars::initActions() {
}
//Add FOV Symbol actions
- fovActionMenu = new KActionMenu( i18n( "&FOV Symbols" ), actionCollection(), "fovsymbols" );
+ fovActionMenu = new TDEActionMenu( i18n( "&FOV Symbols" ), actionCollection(), "fovsymbols" );
initFOV();
- new KAction( i18n( "Location on Earth", "&Geographic..." ),
- "kstars_geo", KShortcut( "Ctrl+G" ), TQT_TQOBJECT(this),
+ new TDEAction( i18n( "Location on Earth", "&Geographic..." ),
+ "kstars_geo", TDEShortcut( "Ctrl+G" ), TQT_TQOBJECT(this),
TQT_SLOT( slotGeoLocator() ), actionCollection(), "geolocation" );
KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( slotViewOps() ), actionCollection(), "configure" );
- new KAction(i18n( "Startup Wizard..." ), "wizard", KShortcut(),
+ new TDEAction(i18n( "Startup Wizard..." ), "wizard", TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT( slotWizard() ), actionCollection(), "startwizard" );
//Tools Menu:
- new KAction(i18n( "Calculator..."), KShortcut( "Ctrl+C"),
+ new TDEAction(i18n( "Calculator..."), TDEShortcut( "Ctrl+C"),
TQT_TQOBJECT(this), TQT_SLOT( slotCalculator() ), actionCollection(), "astrocalculator");
- new KAction(i18n( "Observing List..."), KShortcut( "Ctrl+L"),
+ new TDEAction(i18n( "Observing List..."), TDEShortcut( "Ctrl+L"),
TQT_TQOBJECT(this), TQT_SLOT( slotObsList() ), actionCollection(), "obslist");
// enable action only if file was loaded and processed successfully.
if (!data()->VariableStarsList.isEmpty())
- new KAction(i18n( "AAVSO Light Curves..."), KShortcut( "Ctrl+V"),
+ new TDEAction(i18n( "AAVSO Light Curves..."), TDEShortcut( "Ctrl+V"),
TQT_TQOBJECT(this), TQT_SLOT( slotLCGenerator() ), actionCollection(), "lightcurvegenerator");
- new KAction(i18n( "Altitude vs. Time..."), KShortcut( "Ctrl+A"),
+ new TDEAction(i18n( "Altitude vs. Time..."), TDEShortcut( "Ctrl+A"),
TQT_TQOBJECT(this), TQT_SLOT( slotAVT() ), actionCollection(), "altitude_vs_time");
- new KAction(i18n( "What's up Tonight..."), KShortcut("Ctrl+U"),
+ new TDEAction(i18n( "What's up Tonight..."), TDEShortcut("Ctrl+U"),
TQT_TQOBJECT(this), TQT_SLOT(slotWUT()), actionCollection(), "whats_up_tonight");
//FIXME GLOSSARY
-// new KAction(i18n( "Glossary..."), KShortcut("Ctrl+K"),
+// new TDEAction(i18n( "Glossary..."), TDEShortcut("Ctrl+K"),
// this, TQT_SLOT(slotGlossary()), actionCollection(), "glossary");
- new KAction(i18n( "Script Builder..."), KShortcut("Ctrl+B"),
+ new TDEAction(i18n( "Script Builder..."), TDEShortcut("Ctrl+B"),
TQT_TQOBJECT(this), TQT_SLOT(slotScriptBuilder()), actionCollection(), "scriptbuilder");
- new KAction(i18n( "Solar System..."), KShortcut("Ctrl+Y"),
+ new TDEAction(i18n( "Solar System..."), TDEShortcut("Ctrl+Y"),
TQT_TQOBJECT(this), TQT_SLOT(slotSolarSystem()), actionCollection(), "solarsystem");
- new KAction(i18n( "Jupiter's Moons..."), KShortcut("Ctrl+J"),
+ new TDEAction(i18n( "Jupiter's Moons..."), TDEShortcut("Ctrl+J"),
TQT_TQOBJECT(this), TQT_SLOT(slotJMoonTool()), actionCollection(), "jmoontool");
// devices Menu
- new KAction(i18n("Telescope Wizard..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTelescopeWizard()), actionCollection(), "telescope_wizard");
- new KAction(i18n("Telescope Properties..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTelescopeProperties()), actionCollection(), "telescope_properties");
- new KAction(i18n("Device Manager..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIDriver()), actionCollection(), "device_manager");
+ new TDEAction(i18n("Telescope Wizard..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTelescopeWizard()), actionCollection(), "telescope_wizard");
+ new TDEAction(i18n("Telescope Properties..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTelescopeProperties()), actionCollection(), "telescope_properties");
+ new TDEAction(i18n("Device Manager..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIDriver()), actionCollection(), "device_manager");
- tmpAction = new KAction(i18n("Capture Image Sequence..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImageSequence()), actionCollection(), "capture_sequence");
+ tmpAction = new TDEAction(i18n("Capture Image Sequence..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImageSequence()), actionCollection(), "capture_sequence");
tmpAction->setEnabled(false);
- tmpAction = new KAction(i18n("INDI Control Panel..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIPanel()), actionCollection(), "indi_control_panel");
+ tmpAction = new TDEAction(i18n("INDI Control Panel..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIPanel()), actionCollection(), "indi_control_panel");
tmpAction->setEnabled(false);
- new KAction(i18n("Configure INDI..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIConf()), actionCollection(), "configure_indi");
+ new TDEAction(i18n("Configure INDI..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIConf()), actionCollection(), "configure_indi");
//Help Menu:
- new KAction( i18n( "Tip of the Day" ), "idea", 0,
+ new TDEAction( i18n( "Tip of the Day" ), "idea", 0,
TQT_TQOBJECT(this), TQT_SLOT( slotTipOfDay() ), actionCollection(), "help_tipofday" );
//Handbook toolBar item:
- new KAction( i18n( "&Handbook" ), "contents", KShortcut( "F1" ),
+ new TDEAction( i18n( "&Handbook" ), "contents", TDEShortcut( "F1" ),
TQT_TQOBJECT(this), TQT_SLOT( appHelpActivated() ), actionCollection(), "handbook" );
//
@@ -253,39 +253,39 @@ void KStars::initActions() {
//
//show_stars:
- a = new KToggleAction( i18n( "Toggle Stars" ), "kstars_stars",
+ a = new TDEToggleAction( i18n( "Toggle Stars" ), "kstars_stars",
0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_stars" );
//show_deepsky:
- a = new KToggleAction( i18n( "Toggle Deep Sky Objects" ), "kstars_deepsky",
+ a = new TDEToggleAction( i18n( "Toggle Deep Sky Objects" ), "kstars_deepsky",
0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_deepsky" );
//show_planets:
- a = new KToggleAction( i18n( "Toggle Solar System" ), "kstars_planets",
+ a = new TDEToggleAction( i18n( "Toggle Solar System" ), "kstars_planets",
0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_planets" );
//show_clines:
- a = new KToggleAction( i18n( "Toggle Constellation Lines" ), "kstars_clines",
+ a = new TDEToggleAction( i18n( "Toggle Constellation Lines" ), "kstars_clines",
0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_clines" );
//show_cnames:
- a = new KToggleAction( i18n( "Toggle Constellation Names" ), "kstars_cnames",
+ a = new TDEToggleAction( i18n( "Toggle Constellation Names" ), "kstars_cnames",
0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cnames" );
//show_cbound:
- a = new KToggleAction( i18n( "Toggle Constellation Boundaries" ), "kstars_cbound",
+ a = new TDEToggleAction( i18n( "Toggle Constellation Boundaries" ), "kstars_cbound",
0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cbounds" );
//show_mw:
- a = new KToggleAction( i18n( "Toggle Milky Way" ), "kstars_mw",
+ a = new TDEToggleAction( i18n( "Toggle Milky Way" ), "kstars_mw",
0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_mw" );
//show_grid:
- a = new KToggleAction( i18n( "Toggle Coordinate Grid" ), "kstars_grid",
+ a = new TDEToggleAction( i18n( "Toggle Coordinate Grid" ), "kstars_grid",
0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_grid" );
//show_horizon:
- a = new KToggleAction( i18n( "Toggle Ground" ), "kstars_horizon",
+ a = new TDEToggleAction( i18n( "Toggle Ground" ), "kstars_horizon",
0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_horizon" );
if (Options::fitsSaveDirectory().isEmpty())
@@ -327,7 +327,7 @@ void KStars::initFOV() {
if ( fields.count() == 4 ) {
nm = fields[0].stripWhiteSpace();
- KToggleAction *kta = new KToggleAction( nm, 0, TQT_TQOBJECT(this), TQT_SLOT( slotTargetSymbol() ),
+ TDEToggleAction *kta = new TDEToggleAction( nm, 0, TQT_TQOBJECT(this), TQT_SLOT( slotTargetSymbol() ),
actionCollection(), nm.utf8() );
kta->setExclusiveGroup( "fovsymbol" );
if ( nm == Options::fOVName() ) kta->setChecked( true );
@@ -339,7 +339,7 @@ void KStars::initFOV() {
}
fovActionMenu->popupMenu()->insertSeparator();
- fovActionMenu->insert( new KAction( i18n( "Edit FOV Symbols..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) );
+ fovActionMenu->insert( new TDEAction( i18n( "Edit FOV Symbols..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) );
}
void KStars::initStatusBar() {
@@ -477,7 +477,7 @@ void KStars::privatedata::buildGUI() {
//Do not show text on the view toolbar buttons
//FIXME: after strings freeze, remove this and make the
//text of each button shorter
- ks->toolBar( "viewToolBar" )->setIconText( KToolBar::IconOnly );
+ ks->toolBar( "viewToolBar" )->setIconText( TDEToolBar::IconOnly );
ks->TimeStep = new TimeStepBox( ks->toolBar() );
ks->toolBar()->insertWidget( 0, 6, ks->TimeStep, 15 );
diff --git a/kstars/kstars/kswizardui.ui b/kstars/kstars/kswizardui.ui
index 2a612e2e..3d81e6e3 100644
--- a/kstars/kstars/kswizardui.ui
+++ b/kstars/kstars/kswizardui.ui
@@ -382,7 +382,7 @@ country.&lt;/p&gt;
</widget>
</hbox>
</widget>
- <widget class="KListBox">
+ <widget class="TDEListBox">
<property name="name">
<cstring>CityListBox</cstring>
</property>
diff --git a/kstars/kstars/opscolorsui.ui b/kstars/kstars/opscolorsui.ui
index fc70d791..aff25ac1 100644
--- a/kstars/kstars/opscolorsui.ui
+++ b/kstars/kstars/opscolorsui.ui
@@ -30,7 +30,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListBox">
+ <widget class="TDEListBox">
<property name="name">
<cstring>ColorPalette</cstring>
</property>
@@ -156,7 +156,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListBox">
+ <widget class="TDEListBox">
<property name="name">
<cstring>PresetBox</cstring>
</property>
diff --git a/kstars/kstars/telescopepropui.ui b/kstars/kstars/telescopepropui.ui
index 91b3aefc..53f8c8f2 100644
--- a/kstars/kstars/telescopepropui.ui
+++ b/kstars/kstars/telescopepropui.ui
@@ -89,7 +89,7 @@
</widget>
</hbox>
</widget>
- <widget class="KListBox" row="1" column="0" rowspan="2" colspan="1">
+ <widget class="TDEListBox" row="1" column="0" rowspan="2" colspan="1">
<property name="name">
<cstring>telescopeListBox</cstring>
</property>
diff --git a/kstars/kstars/thumbnailpickerui.ui b/kstars/kstars/thumbnailpickerui.ui
index c3232750..7bd41bbd 100644
--- a/kstars/kstars/thumbnailpickerui.ui
+++ b/kstars/kstars/thumbnailpickerui.ui
@@ -76,7 +76,7 @@
</widget>
</hbox>
</widget>
- <widget class="KListBox">
+ <widget class="TDEListBox">
<property name="name">
<cstring>ImageList</cstring>
</property>
diff --git a/kstars/kstars/toggleaction.cpp b/kstars/kstars/toggleaction.cpp
index a0b59a64..d95fb2dc 100644
--- a/kstars/kstars/toggleaction.cpp
+++ b/kstars/kstars/toggleaction.cpp
@@ -20,7 +20,7 @@
ToggleAction::ToggleAction(const TQString& ontext, const TQIconSet& onpix,
const TQString& offtext, const TQIconSet& offpix,
int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) :
- KAction(ontext, onpix, accel, receiver, slot, parent, name),
+ TDEAction(ontext, onpix, accel, receiver, slot, parent, name),
officon(offpix),
onicon(onpix),
offcap(offtext),
@@ -30,7 +30,7 @@ ToggleAction::ToggleAction(const TQString& ontext, const TQIconSet& onpix,
ToggleAction::ToggleAction(const TQString& ontext, const TQString& offtext,
int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) :
- KAction(ontext, accel, receiver, slot, parent, name),
+ TDEAction(ontext, accel, receiver, slot, parent, name),
officon(),
onicon(),
offcap(offtext),
diff --git a/kstars/kstars/toggleaction.h b/kstars/kstars/toggleaction.h
index 9f1b2365..ca8550dd 100644
--- a/kstars/kstars/toggleaction.h
+++ b/kstars/kstars/toggleaction.h
@@ -29,7 +29,7 @@
#include <tqiconset.h>
#include <kaction.h>
-class ToggleAction : public KAction {
+class ToggleAction : public TDEAction {
Q_OBJECT
diff --git a/kstars/kstars/tools/altvstimeui.ui b/kstars/kstars/tools/altvstimeui.ui
index 629dc8d9..92f5030c 100644
--- a/kstars/kstars/tools/altvstimeui.ui
+++ b/kstars/kstars/tools/altvstimeui.ui
@@ -256,7 +256,7 @@
</widget>
</vbox>
</widget>
- <widget class="KListBox">
+ <widget class="TDEListBox">
<property name="name">
<cstring>PlotList</cstring>
</property>
diff --git a/kstars/kstars/tools/argloadcolorscheme.ui b/kstars/kstars/tools/argloadcolorscheme.ui
index 1e7d1732..45c9ecd7 100644
--- a/kstars/kstars/tools/argloadcolorscheme.ui
+++ b/kstars/kstars/tools/argloadcolorscheme.ui
@@ -16,7 +16,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListBox">
+ <widget class="TDEListBox">
<property name="name">
<cstring>SchemeList</cstring>
</property>
diff --git a/kstars/kstars/tools/lcgenerator.cpp b/kstars/kstars/tools/lcgenerator.cpp
index 2fef2a5a..bcb593d8 100644
--- a/kstars/kstars/tools/lcgenerator.cpp
+++ b/kstars/kstars/tools/lcgenerator.cpp
@@ -80,7 +80,7 @@ void LCGenerator::createGUI()
desigLabel->setMinimumSize( TQSize( 70, 0 ) );
DesignHLayout->addWidget( desigLabel );
- DesignationIn = new KListBox( StarInfoBox, "DesignationIn" );
+ DesignationIn = new TDEListBox( StarInfoBox, "DesignationIn" );
DesignHLayout->addWidget( DesignationIn );
StarInfoBoxLayout->addLayout( DesignHLayout );
@@ -94,7 +94,7 @@ void LCGenerator::createGUI()
nameLabel->setMinimumSize( TQSize( 70, 0 ) );
NameHLayout->addWidget( nameLabel );
- NameIn = new KListBox( StarInfoBox, "NameIn" );
+ NameIn = new TDEListBox( StarInfoBox, "NameIn" );
NameHLayout->addWidget( NameIn );
StarInfoBoxLayout->addLayout( NameHLayout );
diff --git a/kstars/kstars/tools/lcgenerator.h b/kstars/kstars/tools/lcgenerator.h
index 569d1e7f..c0faacbe 100644
--- a/kstars/kstars/tools/lcgenerator.h
+++ b/kstars/kstars/tools/lcgenerator.h
@@ -36,7 +36,7 @@ class TQHBoxLayout;
class TQGridLayout;
class TQFile;
class KLineEdit;
-class KListBox;
+class TDEListBox;
class KPushButton;
class TQCheckBox;
class TQGroupBox;
@@ -92,9 +92,9 @@ private:
TQGroupBox* StarInfoBox;
TQLabel* desigLabel;
- KListBox* DesignationIn;
+ TDEListBox* DesignationIn;
TQLabel* nameLabel;
- KListBox* NameIn;
+ TDEListBox* NameIn;
TQLabel* startLabel;
KLineEdit* StartDateIn;
TQLabel* endLabel;
diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp
index c8bd8709..963d3cdd 100644
--- a/kstars/kstars/tools/observinglist.cpp
+++ b/kstars/kstars/tools/observinglist.cpp
@@ -156,7 +156,7 @@ void ObservingList::slotAddObject( SkyObject *obj ) {
//Insert object entry in FullTable and TinyTable
TQString smag("--");
if ( obj->mag() < 90.0 ) smag = TQString::number( obj->mag(), 'g', 2 );
- new KListViewItem( ui->FullTable, obj->translatedName(),
+ new TDEListViewItem( ui->FullTable, obj->translatedName(),
obj->ra()->toHMSString(),
obj->dec()->toDMSString(),
smag,
diff --git a/kstars/kstars/tools/observinglistui.ui b/kstars/kstars/tools/observinglistui.ui
index 4a664c0c..33a2dbbc 100644
--- a/kstars/kstars/tools/observinglistui.ui
+++ b/kstars/kstars/tools/observinglistui.ui
@@ -385,7 +385,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="KListView">
+ <widget class="TDEListView">
<column>
<property name="text">
<string>Name</string>
@@ -476,7 +476,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="KListBox">
+ <widget class="TDEListBox">
<property name="name">
<cstring>TinyTable</cstring>
</property>
diff --git a/kstars/kstars/tools/obslistwizardui.ui b/kstars/kstars/tools/obslistwizardui.ui
index e7891bed..5fd3f6d2 100644
--- a/kstars/kstars/tools/obslistwizardui.ui
+++ b/kstars/kstars/tools/obslistwizardui.ui
@@ -43,7 +43,7 @@
<string>Selection filters:</string>
</property>
</widget>
- <widget class="KListView">
+ <widget class="TDEListView">
<column>
<property name="text">
<string>Filter</string>
@@ -170,7 +170,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListBox">
+ <widget class="TDEListBox">
<item>
<property name="text">
<string>Stars</string>
@@ -305,7 +305,7 @@
<string>Select objects in constell&amp;ation(s):</string>
</property>
</widget>
- <widget class="KListBox">
+ <widget class="TDEListBox">
<property name="name">
<cstring>ConstellationList</cstring>
</property>
diff --git a/kstars/kstars/tools/optionstreeview.ui b/kstars/kstars/tools/optionstreeview.ui
index 775b2270..c5adc126 100644
--- a/kstars/kstars/tools/optionstreeview.ui
+++ b/kstars/kstars/tools/optionstreeview.ui
@@ -22,7 +22,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListView">
+ <widget class="TDEListView">
<column>
<property name="text">
<string>Option Name</string>
diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp
index a66d7bca..3f6afe34 100644
--- a/kstars/kstars/tools/scriptbuilder.cpp
+++ b/kstars/kstars/tools/scriptbuilder.cpp
@@ -217,7 +217,7 @@ ScriptBuilder::ScriptBuilder( TQWidget *parent, const char *name )
// Modified by JM
- // We're using KListView instead of listbox to arrange the functions in two
+ // We're using TDEListView instead of listbox to arrange the functions in two
// main categories: KStars and INDI. INDI is further subdivided.
sb->FunctionListView->addColumn(i18n("Functions"));
diff --git a/kstars/kstars/tools/scriptbuilderui.ui b/kstars/kstars/tools/scriptbuilderui.ui
index e34e6dcb..bf17b669 100644
--- a/kstars/kstars/tools/scriptbuilderui.ui
+++ b/kstars/kstars/tools/scriptbuilderui.ui
@@ -246,7 +246,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListBox">
+ <widget class="TDEListBox">
<property name="name">
<cstring>ScriptListBox</cstring>
</property>
@@ -507,7 +507,7 @@
<property name="orientation">
<enum>Vertical</enum>
</property>
- <widget class="KListView">
+ <widget class="TDEListView">
<property name="name">
<cstring>FunctionListView</cstring>
</property>
diff --git a/kstars/kstars/tools/wutdialogui.ui b/kstars/kstars/tools/wutdialogui.ui
index b80697da..7117eb8a 100644
--- a/kstars/kstars/tools/wutdialogui.ui
+++ b/kstars/kstars/tools/wutdialogui.ui
@@ -398,7 +398,7 @@
<string>Choose a category:</string>
</property>
</widget>
- <widget class="KListBox" row="1" column="1">
+ <widget class="TDEListBox" row="1" column="1">
<property name="name">
<cstring>ObjectListBox</cstring>
</property>
@@ -515,7 +515,7 @@
</widget>
</vbox>
</widget>
- <widget class="KListBox" row="1" column="0">
+ <widget class="TDEListBox" row="1" column="0">
<property name="name">
<cstring>CategoryListBox</cstring>
</property>
diff --git a/ktouch/ChangeLog b/ktouch/ChangeLog
index b8a9c1e7..3a2c5e46 100644
--- a/ktouch/ChangeLog
+++ b/ktouch/ChangeLog
@@ -121,7 +121,7 @@
2004-09-30 Anne-Marie Mahfouf <annemarie.mahfouf@free.fr>
* Port to TDEConfig XT
* Port the Trainig ->Default Lectures, Settings->Keyboard Layouts,
- Settings->Keyboard Color Schemes to KSelectAction
+ Settings->Keyboard Color Schemes to TDESelectAction
* Add tooltips and QWhatsThis help in Config dialogs
2004-04-02 Andreas Nicolai <andreas.nicolai@gmx.net>
diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp
index 4e9ba2da..39a0b445 100644
--- a/ktouch/src/ktouch.cpp
+++ b/ktouch/src/ktouch.cpp
@@ -59,7 +59,7 @@
KTouch * KTouchPtr = NULL;
KTouch::KTouch()
- : KMainWindow( 0, "KTouch" ),
+ : TDEMainWindow( 0, "KTouch" ),
m_statusWidget(NULL),
m_keyboardWidget(NULL),
m_trainer(NULL)
@@ -530,7 +530,7 @@ bool KTouch::queryExit() {
void KTouch::resizeEvent(TQResizeEvent * event) {
changeStatusbarStats(m_trainer->m_levelStats.m_correctChars, m_trainer->m_levelStats.m_totalChars, m_trainer->m_levelStats.m_words,
m_trainer->m_sessionStats.m_correctChars, m_trainer->m_sessionStats.m_totalChars, m_trainer->m_sessionStats.m_words);
- KMainWindow::resizeEvent(event);
+ TDEMainWindow::resizeEvent(event);
}
// ----------------------------------------------------------------------------
@@ -683,26 +683,26 @@ void KTouch::initTrainingSession() {
// Creates the (standard) actions and entries in the menu.
void KTouch::setupActions() {
// *** File menu ***
- new KAction(i18n("&Open lecture..."), "open_lecture", 0,
+ new TDEAction(i18n("&Open lecture..."), "open_lecture", 0,
TQT_TQOBJECT(this), TQT_SLOT(fileOpenLecture()), actionCollection(), "file_openlecture");
- new KAction(i18n("&Edit lecture..."), "edit_lecture", 0,
+ new TDEAction(i18n("&Edit lecture..."), "edit_lecture", 0,
TQT_TQOBJECT(this), TQT_SLOT(fileEditLecture()), actionCollection(), "file_editlecture");
- new KAction(i18n("&Edit color scheme..."), "edit_colors", 0,
+ new TDEAction(i18n("&Edit color scheme..."), "edit_colors", 0,
TQT_TQOBJECT(this), TQT_SLOT(fileEditColors()), actionCollection(), "file_editcolors");
-// new KAction(i18n("&Edit Keyboard..."), "edit_keyboard", 0,
+// new TDEAction(i18n("&Edit Keyboard..."), "edit_keyboard", 0,
// TQT_TQOBJECT(this), TQT_SLOT(fileEditKeyboard()), actionCollection(), "file_editkeyboard");
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(fileQuit()), actionCollection());
// *** Training menu ***
- new KAction(i18n("&Start New Session"), "launch", 0,
+ new TDEAction(i18n("&Start New Session"), "launch", 0,
TQT_TQOBJECT(this), TQT_SLOT(trainingNewSession()), actionCollection(), "training_newsession");
- m_trainingPause = new KAction(i18n("&Pause Session"), "player_pause", 0,
+ m_trainingPause = new TDEAction(i18n("&Pause Session"), "player_pause", 0,
TQT_TQOBJECT(this), TQT_SLOT(trainingPause()), actionCollection(), "training_pause");
- new KAction(i18n("&Lecture Statistics"), "kalarm", 0,
+ new TDEAction(i18n("&Lecture Statistics"), "kalarm", 0,
TQT_TQOBJECT(this), TQT_SLOT(trainingStatistics()), actionCollection(), "training_stats");
// Setup menu entries for the training lectures
- m_defaultLectureAction = new KSelectAction(i18n("Default &Lectures"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "default_lectures");
+ m_defaultLectureAction = new TDESelectAction(i18n("Default &Lectures"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "default_lectures");
m_defaultLectureAction->setMenuAccelsEnabled(false);
m_defaultLectureAction->setItems(m_lectureTitles);
m_defaultLectureAction->setCurrentItem(0);
@@ -711,13 +711,13 @@ void KTouch::setupActions() {
// *** Settings menu ***
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection());
// Setup menu entries for keyboard layouts
- m_keyboardLayoutAction= new KSelectAction(i18n("&Keyboard Layouts"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "keyboard_layouts");
+ m_keyboardLayoutAction= new TDESelectAction(i18n("&Keyboard Layouts"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "keyboard_layouts");
m_keyboardLayoutAction->setMenuAccelsEnabled(false);
m_keyboardLayoutAction->setItems(m_keyboardTitles);
connect (m_keyboardLayoutAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changeKeyboard(int)));
// Setup menu entries for colour schemes
- m_keyboardColorAction = new KSelectAction(i18n("&Color Schemes"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "keyboard_schemes");
+ m_keyboardColorAction = new TDESelectAction(i18n("&Color Schemes"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "keyboard_schemes");
TQStringList schemes_list;
for (unsigned int i=0; i<KTouchColorScheme::m_colorSchemes.count(); ++i)
schemes_list.append(KTouchColorScheme::m_colorSchemes[i].m_name);
diff --git a/ktouch/src/ktouch.h b/ktouch/src/ktouch.h
index 85697d59..dd7f859d 100644
--- a/ktouch/src/ktouch.h
+++ b/ktouch/src/ktouch.h
@@ -26,9 +26,9 @@
#include <kurl.h>
class TQLabel;
-class KToggleAction;
-class KActionMenu;
-class KSelectAction;
+class TDEToggleAction;
+class TDEActionMenu;
+class TDESelectAction;
class KTouchStatus;
class KTouchSlideLine;
@@ -48,7 +48,7 @@ class KTouchPrefColorsLayout;
/// It handles the lecture, training data, status and all other widgets that are
/// needed to get the program running. Since all special tasks are delegated to the
/// appropriate widgets and classes, the remaining code in KTouch is basically the
-/// startup and KAction stuff.<p>
+/// startup and TDEAction stuff.<p>
/// A word about dialogs. All dialogs in this program are not created by default.
/// Instead they are created "on first use". This
/// saves memory (because we don't need them always) and the startup speed increases.<p>
@@ -56,7 +56,7 @@ class KTouchPrefColorsLayout;
/// typed char. It delegates the character to the trainer
/// (KTouchTrainer), which will then process it. So the heavy work lies in the trainer
/// object and all the widgets.
-class KTouch : public KMainWindow {
+class KTouch : public TDEMainWindow {
Q_OBJECT
public:
@@ -148,11 +148,11 @@ class KTouch : public KMainWindow {
void updateKeyboardActionCheck();
// *** Public member variables ***
- KAction *m_trainingPause; ///< Action for "pause training session".
+ TDEAction *m_trainingPause; ///< Action for "pause training session".
- KSelectAction *m_keyboardLayoutAction;
- KSelectAction *m_keyboardColorAction;
- KSelectAction *m_defaultLectureAction;
+ TDESelectAction *m_keyboardLayoutAction;
+ TDESelectAction *m_keyboardColorAction;
+ TDESelectAction *m_defaultLectureAction;
KTouchStatus *m_statusWidget; ///< Pointer to the status widget on top of the main widget.
KTouchSlideLine *m_slideLineWidget; ///< Pointer to the sliding line widget.
diff --git a/ktouch/src/ktouchkeyboardeditor.cpp b/ktouch/src/ktouchkeyboardeditor.cpp
index ac51b005..9d3ce406 100644
--- a/ktouch/src/ktouchkeyboardeditor.cpp
+++ b/ktouch/src/ktouchkeyboardeditor.cpp
@@ -60,7 +60,7 @@ bool KTouchKeyboardEditor::startEditor(const KURL& url) {
void KTouchKeyboardEditor::fontBtnClicked() {
//kdDebug() << "Fontbutton clicked" << endl;
TQFont f;
- if (KFontDialog::getFont(f, false, this, true)==TQDialog::Accepted) {
+ if (TDEFontDialog::getFont(f, false, this, true)==TQDialog::Accepted) {
m_keyboard.m_fontSuggestions = f.toString();
// update font and keyboard display
titleEdit->setFont(f);
diff --git a/ktouch/src/ktouchlectureeditor.cpp b/ktouch/src/ktouchlectureeditor.cpp
index f8504c21..27c74ec4 100644
--- a/ktouch/src/ktouchlectureeditor.cpp
+++ b/ktouch/src/ktouchlectureeditor.cpp
@@ -81,7 +81,7 @@ bool KTouchLectureEditor::startEditor(const KURL& url) {
void KTouchLectureEditor::fontBtnClicked() {
TQFont f(m_lecture.m_fontSuggestions);
- if (KFontDialog::getFont(f, false, this, true)==TQDialog::Accepted) {
+ if (TDEFontDialog::getFont(f, false, this, true)==TQDialog::Accepted) {
linesTextEdit->setFont(f);
lectureCommentEdit->setFont(f);
levelCommentEdit->setFont(f);
diff --git a/ktouch/src/ktouchlectureeditor_dlg.ui b/ktouch/src/ktouchlectureeditor_dlg.ui
index 65882275..20ecbb94 100644
--- a/ktouch/src/ktouchlectureeditor_dlg.ui
+++ b/ktouch/src/ktouchlectureeditor_dlg.ui
@@ -115,7 +115,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListView">
+ <widget class="TDEListView">
<column>
<property name="text">
<string>Levels</string>
diff --git a/ktouch/src/ktouchprefgenerallayout.ui b/ktouch/src/ktouchprefgenerallayout.ui
index f205c1ab..3a23de1b 100644
--- a/ktouch/src/ktouchprefgenerallayout.ui
+++ b/ktouch/src/ktouchprefgenerallayout.ui
@@ -278,7 +278,7 @@
</size>
</property>
</spacer>
- <widget class="KFontRequester" row="2" column="0" rowspan="1" colspan="2">
+ <widget class="TDEFontRequester" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>kcfg_Font</cstring>
</property>
diff --git a/ktouch/src/ktouchprefkeyboardlayout.ui b/ktouch/src/ktouchprefkeyboardlayout.ui
index 3105d19c..36bc7c23 100644
--- a/ktouch/src/ktouchprefkeyboardlayout.ui
+++ b/ktouch/src/ktouchprefkeyboardlayout.ui
@@ -102,7 +102,7 @@
<string>Font for keys on keyboard:</string>
</property>
</widget>
- <widget class="KFontRequester">
+ <widget class="TDEFontRequester">
<property name="name">
<cstring>kcfg_KeyboardFont</cstring>
</property>
diff --git a/kturtle/src/kturtle.cpp b/kturtle/src/kturtle.cpp
index ce30ce34..436d0084 100644
--- a/kturtle/src/kturtle.cpp
+++ b/kturtle/src/kturtle.cpp
@@ -120,25 +120,25 @@ MainWindow::~MainWindow()
void MainWindow::setupActions()
{
- KActionCollection *ac = actionCollection(); // abbreviation
+ TDEActionCollection *ac = actionCollection(); // abbreviation
// File actions
KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotNewFile()), ac);
- openExAction = new KAction(i18n("Open Exa&mples..."), "bookmark_folder", CTRL+Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotOpenExample()), ac, "open_examples");
+ openExAction = new TDEAction(i18n("Open Exa&mples..."), "bookmark_folder", CTRL+Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotOpenExample()), ac, "open_examples");
KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotOpenFile()), ac);
m_recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotOpenFile(const KURL&)), ac);
KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotSaveFile()), ac);
KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), ac);
- new KAction(i18n("Save &Canvas..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveCanvas()), ac, "save_canvas");
- speed = new KSelectAction(i18n("Execution Speed"), 0, ALT+Key_S, TQT_TQOBJECT(this), TQT_SLOT( slotChangeSpeed() ), ac, "speed");
+ new TDEAction(i18n("Save &Canvas..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveCanvas()), ac, "save_canvas");
+ speed = new TDESelectAction(i18n("Execution Speed"), 0, ALT+Key_S, TQT_TQOBJECT(this), TQT_SLOT( slotChangeSpeed() ), ac, "speed");
TQStringList speeds; speeds << i18n("Full Speed") << i18n("Slow") << i18n("Slower") << i18n("Slowest");
speed->setItems(speeds);
speed->setCurrentItem(0);
- run = new KAction(i18n("&Execute Commands"), "gear", ALT+Key_Return, TQT_TQOBJECT(this), TQT_SLOT( slotExecute() ), ac, "run");
- pause = new KToggleAction(i18n("Pause E&xecution"), "player_pause", Key_Pause, TQT_TQOBJECT(this), TQT_SLOT( slotPauseExecution() ), ac, "pause");
+ run = new TDEAction(i18n("&Execute Commands"), "gear", ALT+Key_Return, TQT_TQOBJECT(this), TQT_SLOT( slotExecute() ), ac, "run");
+ pause = new TDEToggleAction(i18n("Pause E&xecution"), "player_pause", Key_Pause, TQT_TQOBJECT(this), TQT_SLOT( slotPauseExecution() ), ac, "pause");
pause->setChecked(false);
pause->setEnabled(false);
- stop = new KAction(i18n("Stop E&xecution"), "stop", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT( slotAbortExecution() ), ac, "stop");
+ stop = new TDEAction(i18n("Stop E&xecution"), "stop", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT( slotAbortExecution() ), ac, "stop");
stop->setEnabled(false);
KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), ac);
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), ac);
@@ -151,31 +151,31 @@ void MainWindow::setupActions()
KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), ac);
KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), ac);
KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(slotClearSelection()), ac);
- new KToggleAction(i18n("Toggle Insert"), Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotToggleInsert()), ac, "set_insert");
+ new TDEToggleAction(i18n("Toggle Insert"), Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotToggleInsert()), ac, "set_insert");
KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(slotFind()), ac);
KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(slotFindNext()), ac);
KStdAction::findPrev(TQT_TQOBJECT(this), TQT_SLOT(slotFindPrevious()), ac);
KStdAction::replace(TQT_TQOBJECT(this), TQT_SLOT(slotReplace()), ac);
// View actions
- new KToggleAction(i18n("Show &Line Numbers"), 0, Key_F11, TQT_TQOBJECT(this), TQT_SLOT(slotToggleLineNumbers()), ac, "line_numbers");
+ new TDEToggleAction(i18n("Show &Line Numbers"), 0, Key_F11, TQT_TQOBJECT(this), TQT_SLOT(slotToggleLineNumbers()), ac, "line_numbers");
m_fullscreen = KStdAction::fullScreen(TQT_TQOBJECT(this), TQT_SLOT(slotToggleFullscreen()), ac, this, "full_screen");
m_fullscreen->setChecked(b_fullscreen);
// Tools actions
- colorpicker = new KToggleAction(i18n("&Color Picker"), "colorize", ALT+Key_C, TQT_TQOBJECT(this), TQT_SLOT(slotColorPicker()), ac, "color_picker");
- new KAction(i18n("&Indent"), "indent", CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotIndent()), ac, "edit_indent");
- new KAction(i18n("&Unindent"), "unindent", CTRL+SHIFT+Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotUnIndent()), ac, "edit_unindent");
- new KAction(i18n("Cl&ean Indentation"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleanIndent()), ac, "edit_cleanIndent");
- new KAction(i18n("Co&mment"), 0, CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT(slotComment()), ac, "edit_comment");
- new KAction(i18n("Unc&omment"), 0, CTRL+SHIFT+Key_D, TQT_TQOBJECT(this), TQT_SLOT(slotUnComment()), ac, "edit_uncomment");
+ colorpicker = new TDEToggleAction(i18n("&Color Picker"), "colorize", ALT+Key_C, TQT_TQOBJECT(this), TQT_SLOT(slotColorPicker()), ac, "color_picker");
+ new TDEAction(i18n("&Indent"), "indent", CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotIndent()), ac, "edit_indent");
+ new TDEAction(i18n("&Unindent"), "unindent", CTRL+SHIFT+Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotUnIndent()), ac, "edit_unindent");
+ new TDEAction(i18n("Cl&ean Indentation"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleanIndent()), ac, "edit_cleanIndent");
+ new TDEAction(i18n("Co&mment"), 0, CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT(slotComment()), ac, "edit_comment");
+ new TDEAction(i18n("Unc&omment"), 0, CTRL+SHIFT+Key_D, TQT_TQOBJECT(this), TQT_SLOT(slotUnComment()), ac, "edit_uncomment");
// Settings actions
KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotSettings()), ac );
- new KAction(i18n("&Configure Editor..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditor()), ac, "set_confdlg");
+ new TDEAction(i18n("&Configure Editor..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditor()), ac, "set_confdlg");
// Help actions
- ContextHelp = new KAction(0, 0, Key_F2, TQT_TQOBJECT(this), TQT_SLOT(slotContextHelp()), ac, "context_help");
+ ContextHelp = new TDEAction(0, 0, Key_F2, TQT_TQOBJECT(this), TQT_SLOT(slotContextHelp()), ac, "context_help");
slotContextHelpUpdate(); // this sets the label of this action
// other
@@ -654,7 +654,7 @@ void MainWindow::slotMessageDialog(TQString text)
void MainWindow::slotEditor()
{
- KAction *a = editor->actionCollection()->action("set_confdlg");
+ TDEAction *a = editor->actionCollection()->action("set_confdlg");
a->activate();
}
@@ -716,68 +716,68 @@ void MainWindow::slotClearSelection()
void MainWindow::slotFind()
{
- KAction *a = editor->actionCollection()->action("edit_find");
+ TDEAction *a = editor->actionCollection()->action("edit_find");
a->activate();
}
void MainWindow::slotFindNext()
{
- KAction *a = editor->actionCollection()->action("edit_find_next");
+ TDEAction *a = editor->actionCollection()->action("edit_find_next");
a->activate();
}
void MainWindow::slotFindPrevious()
{
- KAction *a = editor->actionCollection()->action("edit_find_prev");
+ TDEAction *a = editor->actionCollection()->action("edit_find_prev");
a->activate();
}
void MainWindow::slotReplace()
{
- KAction* a = editor->actionCollection()->action("edit_replace");
+ TDEAction* a = editor->actionCollection()->action("edit_replace");
a->activate();
}
void MainWindow::slotToggleInsert()
{
- KToggleAction *a = dynamic_cast<KToggleAction*>(editor->actionCollection()->action("set_insert"));
+ TDEToggleAction *a = dynamic_cast<TDEToggleAction*>(editor->actionCollection()->action("set_insert"));
a->activate();
if (a) statusBar()->changeItem(a->isChecked() ? i18n(" OVR ") : i18n(" INS "), IDS_INS);
}
void MainWindow::slotIndent()
{
- KAction *a = editor->actionCollection()->action("tools_indent");
+ TDEAction *a = editor->actionCollection()->action("tools_indent");
a->activate();
}
void MainWindow::slotUnIndent()
{
- KAction *a = editor->actionCollection()->action("tools_unindent");
+ TDEAction *a = editor->actionCollection()->action("tools_unindent");
a->activate();
}
void MainWindow::slotCleanIndent()
{
- KAction *a = editor->actionCollection()->action("tools_cleanIndent");
+ TDEAction *a = editor->actionCollection()->action("tools_cleanIndent");
a->activate();
}
void MainWindow::slotComment()
{
- KAction *a = editor->actionCollection()->action("tools_comment");
+ TDEAction *a = editor->actionCollection()->action("tools_comment");
a->activate();
}
void MainWindow::slotUnComment()
{
- KAction *a = editor->actionCollection()->action("tools_uncomment");
+ TDEAction *a = editor->actionCollection()->action("tools_uncomment");
a->activate();
}
void MainWindow::slotToggleLineNumbers()
{
- KToggleAction *a = dynamic_cast<KToggleAction*>( editor->actionCollection()->action("view_line_numbers") );
+ TDEToggleAction *a = dynamic_cast<TDEToggleAction*>( editor->actionCollection()->action("view_line_numbers") );
a->activate();
}
@@ -817,7 +817,7 @@ bool MainWindow::event(TQEvent* e)
{
// executes updateFullScreen() after a ShowFullScreen or ShowNormal event got triggered
if (e->type() == TQEvent::ShowFullScreen || e->type() == TQEvent::ShowNormal) updateFullScreen();
- return KMainWindow::event(e);
+ return TDEMainWindow::event(e);
}
void MainWindow::updateFullScreen()
diff --git a/kturtle/src/kturtle.h b/kturtle/src/kturtle.h
index 6961fcc1..b9dfd00c 100644
--- a/kturtle/src/kturtle.h
+++ b/kturtle/src/kturtle.h
@@ -40,7 +40,7 @@
#include "parser.h"
-class KRecentFilesAction;
+class TDERecentFilesAction;
class MainWindow : public KParts::MainWindow
@@ -142,17 +142,17 @@ class MainWindow : public KParts::MainWindow
ColorPicker *picker;
RestartOrBack *restartOrBackDialog;
- KAction *run;
- KAction *stop;
- KAction *openExAction;
- KAction *openFileAction;
- KAction *newAction;
- KAction *ContextHelp;
- KToggleAction *pause;
- KToggleAction *m_fullscreen;
- KToggleAction *colorpicker;
- KSelectAction *speed;
- KRecentFilesAction *m_recentFiles;
+ TDEAction *run;
+ TDEAction *stop;
+ TDEAction *openExAction;
+ TDEAction *openFileAction;
+ TDEAction *newAction;
+ TDEAction *ContextHelp;
+ TDEToggleAction *pause;
+ TDEToggleAction *m_fullscreen;
+ TDEToggleAction *colorpicker;
+ TDESelectAction *speed;
+ TDERecentFilesAction *m_recentFiles;
KTextEditor::View *view() const { return editor; }
KTextEditor::EditInterface *editorInterface;
diff --git a/kverbos/kverbos/kverbos.cpp b/kverbos/kverbos/kverbos.cpp
index c593a3f9..58af2410 100644
--- a/kverbos/kverbos/kverbos.cpp
+++ b/kverbos/kverbos/kverbos.cpp
@@ -48,7 +48,7 @@
int KVerbosApp::kverbosCounter = 0;
-KVerbosApp::KVerbosApp(TQWidget* , const char* name):KMainWindow (0, name)
+KVerbosApp::KVerbosApp(TQWidget* , const char* name):TDEMainWindow (0, name)
{
// als erstes das Logo starten
TDEStartupLogo* start_logo = new TDEStartupLogo(0);
@@ -116,11 +116,11 @@ KVerbosApp::~KVerbosApp()
void KVerbosApp::initActions()
{
- fileNewWindow = new KAction(i18n("New &Window"), "window_new.png", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewWindow()), actionCollection(),"file_new_window");
+ fileNewWindow = new TDEAction(i18n("New &Window"), "window_new.png", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewWindow()), actionCollection(),"file_new_window");
fileNew = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection());
fileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection());
fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection());
- fileOpenStandard = new KAction(i18n("Open &Standard Verb File"), "fileopen.png", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenStandard()), actionCollection(),"file_open_standard");
+ fileOpenStandard = new TDEAction(i18n("Open &Standard Verb File"), "fileopen.png", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenStandard()), actionCollection(),"file_open_standard");
fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection());
fileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection());
fileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection());
@@ -129,12 +129,12 @@ void KVerbosApp::initActions()
editCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection());
editCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection());
editPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection());
- editErfassen = new KAction(i18n("E&nter New Verb..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditErfassen()), actionCollection(),"edit_erfassen");
- editBearbeiten = new KAction(i18n("&Edit Verb List..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditBearbeiten()), actionCollection(), "edit_bearbeiten");
+ editErfassen = new TDEAction(i18n("E&nter New Verb..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditErfassen()), actionCollection(),"edit_erfassen");
+ editBearbeiten = new TDEAction(i18n("&Edit Verb List..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditBearbeiten()), actionCollection(), "edit_bearbeiten");
- settingOptions = new KAction(i18n("&Configure KVerbos..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSettingsOptions()), actionCollection(), "settings_options");
- userUsername = new KAction(i18n("&Username..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSettingsUsername()), actionCollection(), "user_username");
- userResults = new KAction(i18n("&Results"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotUserResults()), actionCollection(), "user_results");
+ settingOptions = new TDEAction(i18n("&Configure KVerbos..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSettingsOptions()), actionCollection(), "settings_options");
+ userUsername = new TDEAction(i18n("&Username..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSettingsUsername()), actionCollection(), "user_username");
+ userResults = new TDEAction(i18n("&Results"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotUserResults()), actionCollection(), "user_results");
fileNewWindow->setToolTip(i18n("Opens a new application window"));
fileOpenStandard->setToolTip(i18n("Opens the standard KVerbos verb file"));
@@ -500,7 +500,7 @@ void KVerbosApp::slotFileQuit()
saveOptions();
// close the first window, the list makes the next one the first again.
// This ensures that queryClose() is called on each window to ask for closing
- KMainWindow* w;
+ TDEMainWindow* w;
// In der Dokumentation konnte ich leider nicht finden, wozu diese memberliste gut ist.
if(memberList)
{
diff --git a/kverbos/kverbos/kverbos.h b/kverbos/kverbos/kverbos.h
index 2325d482..c125ea0b 100644
--- a/kverbos/kverbos/kverbos.h
+++ b/kverbos/kverbos/kverbos.h
@@ -45,16 +45,16 @@ class KFeederControl;
* window and reads the config file as well as providing a menubar, toolbar
* and statusbar. An instance of KVerbosView creates your center view, which is connected
* to the window's Doc object.
- * KVerbosApp reimplements the methods that KMainWindow provides for main window handling and supports
- * full session management as well as using KActions.
- * @see KMainWindow
+ * KVerbosApp reimplements the methods that TDEMainWindow provides for main window handling and supports
+ * full session management as well as using TDEActions.
+ * @see TDEMainWindow
* @see TDEApplication
* @see TDEConfig
*
* @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
* @version KDevelop version 1.2 code generation
*/
-class KVerbosApp : public KMainWindow
+class KVerbosApp : public TDEMainWindow
{
Q_OBJECT
@@ -86,7 +86,7 @@ class KVerbosApp : public KMainWindow
/** read general Options again and initialize all variables like the recent file list
*/
void readOptions();
- /** initializes the KActions of the application */
+ /** initializes the TDEActions of the application */
void initActions();
/** sets up the statusbar for the main window by initialzing a statuslabel.
*/
@@ -221,26 +221,26 @@ class KVerbosApp : public KMainWindow
*/
KVerbosDoc *doc;
- // KAction pointers to enable/disable actions
- KPopupMenu* menuUser;
- KAction* fileNewWindow;
- KAction* fileNew;
- KAction* fileOpen;
- KRecentFilesAction* fileOpenRecent;
- KAction* fileOpenStandard;
- KAction* fileSave;
- KAction* fileSaveAs;
- KAction* fileClose;
- KAction* filePrint;
- KAction* fileQuit;
- KAction* editCut;
- KAction* editCopy;
- KAction* editPaste;
- KAction* editErfassen;
- KAction* editBearbeiten;
- KAction* settingOptions;
- KAction* userUsername;
- KAction* userResults;
+ // TDEAction pointers to enable/disable actions
+ TDEPopupMenu* menuUser;
+ TDEAction* fileNewWindow;
+ TDEAction* fileNew;
+ TDEAction* fileOpen;
+ TDERecentFilesAction* fileOpenRecent;
+ TDEAction* fileOpenStandard;
+ TDEAction* fileSave;
+ TDEAction* fileSaveAs;
+ TDEAction* fileClose;
+ TDEAction* filePrint;
+ TDEAction* fileQuit;
+ TDEAction* editCut;
+ TDEAction* editCopy;
+ TDEAction* editPaste;
+ TDEAction* editErfassen;
+ TDEAction* editBearbeiten;
+ TDEAction* settingOptions;
+ TDEAction* userUsername;
+ TDEAction* userResults;
diff --git a/kverbos/kverbos/kverbosdoc.h b/kverbos/kverbos/kverbosdoc.h
index f4087933..24bbab7b 100644
--- a/kverbos/kverbos/kverbosdoc.h
+++ b/kverbos/kverbos/kverbosdoc.h
@@ -41,7 +41,7 @@ class KVerbosUser;
*
* The KVerbosDoc class provides a document object that can be used in conjunction with
* the classes KVerbosApp and KVerbosView to create a document-view model for standard KDE
- * applications based on TDEApplication and KMainWindow. Thereby, the document object
+ * applications based on TDEApplication and TDEMainWindow. Thereby, the document object
* is created by the KVerbosApp instance and contains the document structure with the
* according methods for manipulation of the document data by KVerbosView objects. Also,
* KVerbosDoc contains the methods for serialization of the document data from and to files.
diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
index 1729c84f..fb8c4bf9 100644
--- a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
@@ -22,7 +22,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="KFontRequester" row="0" column="1">
+ <widget class="TDEFontRequester" row="0" column="1">
<property name="name">
<cstring>kcfg_TableFont</cstring>
</property>
@@ -38,7 +38,7 @@
<cstring>kcfg_TableFont</cstring>
</property>
</widget>
- <widget class="KFontRequester" row="1" column="1">
+ <widget class="TDEFontRequester" row="1" column="1">
<property name="name">
<cstring>kcfg_IPAFont</cstring>
</property>
diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
index 1230f507..e15f8aef 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
@@ -37,7 +37,7 @@
#include <klocale.h>
EntryDlg::EntryDlg(
- KMainWindow *main,
+ TDEMainWindow *main,
kvoctrainDoc *doc,
bool multi_sel,
bool origin,
diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h
index d1fee66f..14f263bc 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h
@@ -39,7 +39,7 @@
class LangSet;
class TQTabWidget;
-class KMainWindow;
+class TDEMainWindow;
class kvoctrainDoc;
class EntryDlg : public KDialogBase
@@ -54,7 +54,7 @@ public:
enum EnableType {EnableAll, EnableOnlyCommon, EnableNone, EnableOnlyOriginal };
EntryDlg
- ( KMainWindow *main,
+ ( TDEMainWindow *main,
kvoctrainDoc *doc,
bool multi_sel,
bool origin,
@@ -214,7 +214,7 @@ protected:
TQTabWidget *tabber;
vector<TQTableSelection> selections;
- KMainWindow *mainwin;
+ TDEMainWindow *mainwin;
TQSize oldMainSize;
TQPoint oldMainPos;
bool docked;
diff --git a/kvoctrain/kvoctrain/kva_init.cpp b/kvoctrain/kvoctrain/kva_init.cpp
index 86cc7589..b2e90a86 100644
--- a/kvoctrain/kvoctrain/kva_init.cpp
+++ b/kvoctrain/kvoctrain/kva_init.cpp
@@ -41,7 +41,7 @@
#include "prefs.h"
kvoctrainApp::kvoctrainApp(TQWidget *parent, const char *name)
-: KMainWindow(parent, name)
+: TDEMainWindow(parent, name)
{
doc = 0;
view = 0;
@@ -106,17 +106,17 @@ void kvoctrainApp::initActions()
fileOpen->setWhatsThis(i18n("Opens an existing vocabulary document"));
fileOpen->setToolTip(fileOpen->whatsThis());
- fileOpenExample = new KAction(i18n("Open &Example..."), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenExample()), actionCollection(), "file_open_example");
+ fileOpenExample = new TDEAction(i18n("Open &Example..."), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenExample()), actionCollection(), "file_open_example");
fileOpen->setWhatsThis(i18n("Open a vocabulary document"));
fileOpen->setToolTip(fileOpen->whatsThis());
- fileGHNS = new KAction(i18n("&Get New Vocabularies..."), "knewstuff", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(slotGHNS()), actionCollection(), "file_ghns");
+ fileGHNS = new TDEAction(i18n("&Get New Vocabularies..."), "knewstuff", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(slotGHNS()), actionCollection(), "file_ghns");
fileGHNS->setWhatsThis(i18n("Downloads new vocabularies"));
fileGHNS->setToolTip(fileGHNS->whatsThis());
fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection());
- fileMerge = new KAction(i18n("&Merge..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileMerge()), actionCollection(), "file_merge");
+ fileMerge = new TDEAction(i18n("&Merge..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileMerge()), actionCollection(), "file_merge");
fileMerge->setWhatsThis(i18n("Merge an existing vocabulary document with the current one"));
fileMerge->setToolTip(fileOpen->whatsThis());
@@ -156,52 +156,52 @@ void kvoctrainApp::initActions()
editSearchFromClipboard->setWhatsThis(i18n("Search for the clipboard contents in the vocabulary"));
editSearchFromClipboard->setToolTip(editSearchFromClipboard->whatsThis());
- editAppend = new KAction(i18n("&Append New Entry"), "insert_table_row", "Insert", TQT_TQOBJECT(this), TQT_SLOT(slotAppendRow()), actionCollection(),"edit_append");
+ editAppend = new TDEAction(i18n("&Append New Entry"), "insert_table_row", "Insert", TQT_TQOBJECT(this), TQT_SLOT(slotAppendRow()), actionCollection(),"edit_append");
editAppend->setWhatsThis(i18n("Append a new row to the vocabulary"));
editAppend->setToolTip(editAppend->whatsThis());
- editEditSelectedArea = new KAction(i18n("&Edit Selected Area..."), "edit_table_row", "Ctrl+Return", TQT_TQOBJECT(this), TQT_SLOT(slotEditRow()), actionCollection(),"edit_edit_selected_area");
+ editEditSelectedArea = new TDEAction(i18n("&Edit Selected Area..."), "edit_table_row", "Ctrl+Return", TQT_TQOBJECT(this), TQT_SLOT(slotEditRow()), actionCollection(),"edit_edit_selected_area");
editEditSelectedArea->setWhatsThis(i18n("Edit the entries in the selected rows"));
editEditSelectedArea->setToolTip(editEditSelectedArea->whatsThis());
- editRemoveSelectedArea = new KAction(i18n("&Remove Selected Area"), "delete_table_row", "Delete", TQT_TQOBJECT(this), TQT_SLOT(slotRemoveRow()), actionCollection(),"edit_remove_selected_area");
+ editRemoveSelectedArea = new TDEAction(i18n("&Remove Selected Area"), "delete_table_row", "Delete", TQT_TQOBJECT(this), TQT_SLOT(slotRemoveRow()), actionCollection(),"edit_remove_selected_area");
editRemoveSelectedArea->setWhatsThis(i18n("Delete the selected rows"));
editRemoveSelectedArea->setToolTip(editRemoveSelectedArea->whatsThis());
- editSaveSelectedArea = new KAction(i18n("Save E&ntries in Query As..."), TDEGlobal::iconLoader()->loadIcon("filesaveas", KIcon::Small), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area");
+ editSaveSelectedArea = new TDEAction(i18n("Save E&ntries in Query As..."), TDEGlobal::iconLoader()->loadIcon("filesaveas", KIcon::Small), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area");
editSaveSelectedArea->setWhatsThis(i18n("Save the entries in the query as a new vocabulary"));
editSaveSelectedArea->setToolTip(editSaveSelectedArea->whatsThis());
- vocabShowStatistics = new KAction(i18n("Show &Statistics"), "statistics", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowStatist()), actionCollection(),"vocab_show_statistics");
+ vocabShowStatistics = new TDEAction(i18n("Show &Statistics"), "statistics", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowStatist()), actionCollection(),"vocab_show_statistics");
vocabShowStatistics->setWhatsThis(i18n("Show statistics for the current vocabulary"));
vocabShowStatistics->setToolTip(vocabShowStatistics->whatsThis());
- vocabAssignLessons = new KAction(i18n("Assign L&essons..."), "rand_less", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateRandom()), actionCollection(),"vocab_assign_lessons");
+ vocabAssignLessons = new TDEAction(i18n("Assign L&essons..."), "rand_less", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateRandom()), actionCollection(),"vocab_assign_lessons");
vocabAssignLessons->setWhatsThis(i18n("Create random lessons with unassigned entries"));
vocabAssignLessons->setToolTip(vocabAssignLessons->whatsThis());
- vocabCleanUp = new KAction(i18n("&Clean Up"), "cleanup", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleanVocabulary()), actionCollection(),"vocab_clean_up");
+ vocabCleanUp = new TDEAction(i18n("&Clean Up"), "cleanup", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleanVocabulary()), actionCollection(),"vocab_clean_up");
vocabCleanUp->setWhatsThis(i18n("Remove entries with same content from vocabulary"));
vocabCleanUp->setToolTip(vocabCleanUp->whatsThis());
- vocabAppendLanguage = new KSelectAction(i18n("&Append Language"), "insert_table_col", 0, actionCollection(), "vocab_append_language");
+ vocabAppendLanguage = new TDESelectAction(i18n("&Append Language"), "insert_table_col", 0, actionCollection(), "vocab_append_language");
connect(vocabAppendLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabAppendLanguage()));
connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotAppendLang(int)));
connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeaderStatus(int)));
- vocabSetLanguage = new KSelectAction(i18n("Set &Language"), "set_language", 0, actionCollection(), "vocab_set_language");
+ vocabSetLanguage = new TDESelectAction(i18n("Set &Language"), "set_language", 0, actionCollection(), "vocab_set_language");
connect(vocabSetLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabSetLanguage()));
- vocabRemoveLanguage = new KSelectAction(i18n("&Remove Language"), "delete_table_col", 0, actionCollection(), "vocab_remove_language");
+ vocabRemoveLanguage = new TDESelectAction(i18n("&Remove Language"), "delete_table_col", 0, actionCollection(), "vocab_remove_language");
connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabRemoveLanguage()));
connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeaderCallBack(int)));
connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeaderStatus(int)));
- vocabDocumentProperties = new KAction(i18n("Document &Properties"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDocProps()), actionCollection(), "vocab_document_properties");
+ vocabDocumentProperties = new TDEAction(i18n("Document &Properties"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDocProps()), actionCollection(), "vocab_document_properties");
vocabDocumentProperties->setWhatsThis(i18n("Edit document properties"));
vocabDocumentProperties->setToolTip(vocabAppendLanguage->whatsThis());
- vocabLanguageProperties = new KAction(i18n("Lan&guage Properties"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDocPropsLang()), actionCollection(), "vocab_language_properties");
+ vocabLanguageProperties = new TDEAction(i18n("Lan&guage Properties"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDocPropsLang()), actionCollection(), "vocab_language_properties");
vocabLanguageProperties->setWhatsThis(i18n("Edit language properties in current document"));
vocabLanguageProperties->setToolTip(vocabSetLanguage->whatsThis());
@@ -224,11 +224,11 @@ void kvoctrainApp::initActions()
vocabSearch->setWhatsThis(i18n("Search vocabulary for specified text "));
vocabSearch->setToolTip(vocabSearch->whatsThis());
/*
- learningResumeQuery = new KAction(i18n("Resume &Query..."), "run_query", 0, this, TQT_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_query");
+ learningResumeQuery = new TDEAction(i18n("Resume &Query..."), "run_query", 0, this, TQT_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_query");
//learningResumeQuery->setWhatsThis(i18n(""));
learningResumeQuery->setToolTip(learningResumeQuery->whatsThis());
- learningResumeMultipleChoice = new KAction(i18n("&Resume Multiple Choice..."), "run_multi", 0, this, TQT_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_multiple_choice");
+ learningResumeMultipleChoice = new TDEAction(i18n("&Resume Multiple Choice..."), "run_multi", 0, this, TQT_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_multiple_choice");
//learningResumeMultipleChoice->setWhatsThis(i18n(""));
learningResumeMultipleChoice->setToolTip(learningResumeMultipleChoice->whatsThis());
*/
@@ -236,13 +236,13 @@ void kvoctrainApp::initActions()
configApp->setWhatsThis(i18n("Show the configuration dialog"));
configApp->setToolTip(configApp->whatsThis());
- /*configQueryOptions = new KAction(i18n("Configure &Query..."), "configure_query", 0, this, TQT_SLOT(slotQueryOptions()), actionCollection(),"config_query_options");
+ /*configQueryOptions = new TDEAction(i18n("Configure &Query..."), "configure_query", 0, this, TQT_SLOT(slotQueryOptions()), actionCollection(),"config_query_options");
configQueryOptions->setWhatsThis(i18n("Show the query configuration dialog"));
configQueryOptions->setToolTip(configQueryOptions->whatsThis());*/
actionCollection()->setHighlightingEnabled(true);
connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), this, TQT_SLOT(slotStatusHelpMsg(const TQString &)));
- //connect(actionCollection(), TQT_SIGNAL(actionHighlighted(KAction *, bool)), this, TQT_SLOT(slotActionHighlighted(KAction *, bool)));
+ //connect(actionCollection(), TQT_SIGNAL(actionHighlighted(TDEAction *, bool)), this, TQT_SLOT(slotActionHighlighted(TDEAction *, bool)));
if (!initialGeometrySet())
resize( TQSize(550, 400).expandedTo(minimumSizeHint()));
@@ -253,7 +253,7 @@ void kvoctrainApp::initActions()
configToolbar->setWhatsThis(i18n("Toggle display of the toolbars"));
configToolbar->setToolTip(configToolbar->whatsThis());
- learn_menu = (TQPopupMenu*) child( "learning", "KPopupMenu" );
+ learn_menu = (TQPopupMenu*) child( "learning", "TDEPopupMenu" );
connect(learn_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
connect(learn_menu, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
connect(learn_menu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowLearn()));
diff --git a/kvoctrain/kvoctrain/kvoctrain.h b/kvoctrain/kvoctrain/kvoctrain.h
index f17411c1..f6296b5e 100644
--- a/kvoctrain/kvoctrain/kvoctrain.h
+++ b/kvoctrain/kvoctrain/kvoctrain.h
@@ -73,7 +73,7 @@ class KVTNewStuff;
* and statusbar. For the main view, an instance of class kvoctrainView is
* created which creates your view.
*/
-class kvoctrainApp : public KMainWindow
+class kvoctrainApp : public TDEMainWindow
{
Q_OBJECT
@@ -101,12 +101,12 @@ public:
/** saves the window properties for each open window during session end to the session config file, including saving the currently
* opened file by a temporary filename provided by TDEApplication.
- * @see KMainWindow#saveProperties
+ * @see TDEMainWindow#saveProperties
*/
virtual void saveProperties(TDEConfig* );
/** reads the session config file and restores the application's state including the last opened files and documents by reading the
* temporary files saved by saveProperties()
- * @see KMainWindow#readProperties
+ * @see TDEMainWindow#readProperties
*/
virtual void readProperties(TDEConfig* );
@@ -229,46 +229,46 @@ public:
static vector<int> getCsvOrder(kvoctrainDoc *);
private:
- // KAction pointers to enable/disable actions
- KAction* fileNew;
- KAction* fileOpen;
- KAction* fileOpenExample;
- KAction* fileGHNS;
- KRecentFilesAction* fileOpenRecent;
- KAction* fileMerge;
- KAction* fileSave;
- KAction* fileSaveAs;
- KAction* filePrint;
- KAction* fileQuit;
-
- KAction* editCopy;
- KAction* editPaste;
- KAction* editSelectAll;
- KAction* editClearSelection;
- KAction* editSearchFromClipboard;
- KAction* editAppend;
- KAction* editEditSelectedArea;
- KAction* editRemoveSelectedArea;
- KAction* editSaveSelectedArea;
-
- KAction* vocabShowStatistics;
- KAction* vocabAssignLessons;
- KAction* vocabCleanUp;
- KSelectAction* vocabAppendLanguage;
- KSelectAction* vocabSetLanguage;
- KSelectAction* vocabRemoveLanguage;
- KAction* vocabDocumentProperties;
- KAction* vocabLanguageProperties;
+ // TDEAction pointers to enable/disable actions
+ TDEAction* fileNew;
+ TDEAction* fileOpen;
+ TDEAction* fileOpenExample;
+ TDEAction* fileGHNS;
+ TDERecentFilesAction* fileOpenRecent;
+ TDEAction* fileMerge;
+ TDEAction* fileSave;
+ TDEAction* fileSaveAs;
+ TDEAction* filePrint;
+ TDEAction* fileQuit;
+
+ TDEAction* editCopy;
+ TDEAction* editPaste;
+ TDEAction* editSelectAll;
+ TDEAction* editClearSelection;
+ TDEAction* editSearchFromClipboard;
+ TDEAction* editAppend;
+ TDEAction* editEditSelectedArea;
+ TDEAction* editRemoveSelectedArea;
+ TDEAction* editSaveSelectedArea;
+
+ TDEAction* vocabShowStatistics;
+ TDEAction* vocabAssignLessons;
+ TDEAction* vocabCleanUp;
+ TDESelectAction* vocabAppendLanguage;
+ TDESelectAction* vocabSetLanguage;
+ TDESelectAction* vocabRemoveLanguage;
+ TDEAction* vocabDocumentProperties;
+ TDEAction* vocabLanguageProperties;
KWidgetAction* vocabLessons;
KWidgetAction* vocabSearch;
- //KAction* learningResumeQuery;
- //KAction* learningResumeMultipleChoice;
+ //TDEAction* learningResumeQuery;
+ //TDEAction* learningResumeMultipleChoice;
- KAction* configToolbar;
- KAction* configNotifications;
- KAction* configApp;
- //KAction* configQueryOptions;
+ TDEAction* configToolbar;
+ TDEAction* configNotifications;
+ TDEAction* configApp;
+ //TDEAction* configQueryOptions;
TQString lastPixName;
diff --git a/kvoctrain/kvoctrain/main.cpp b/kvoctrain/kvoctrain/main.cpp
index bd692037..1e849ccd 100644
--- a/kvoctrain/kvoctrain/main.cpp
+++ b/kvoctrain/kvoctrain/main.cpp
@@ -99,7 +99,7 @@ static const char version[] = KVOCTRAIN_VERSION_STRING;
kvoctrainApp *kva = 0;
if (app.isRestored()) {
int n = 1;
- while (KMainWindow::canBeRestored(n)){
+ while (TDEMainWindow::canBeRestored(n)){
kva = new kvoctrainApp;
kva->restore(n);
kva->show();
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
index 02d40854..ea7e98ff 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
@@ -272,7 +272,7 @@ void StatistikPage::slotPopupMenu(int row, int col)
else
return;
- KPopupMenu *header_m = new KPopupMenu(i18n("Number of Entries per Grade"));
+ TDEPopupMenu *header_m = new TDEPopupMenu(i18n("Number of Entries per Grade"));
header_m->insertItem (i18n(KV_NORM_TEXT) + "\t" + TQString::number(sc->grade[KV_NORM_GRADE]) );
header_m->insertItem (i18n(KV_LEV1_TEXT) + "\t" + TQString::number(sc->grade[KV_LEV1_GRADE]) );
diff --git a/kwordquiz/src/flashview.h b/kwordquiz/src/flashview.h
index c1f8c02f..8de031c1 100644
--- a/kwordquiz/src/flashview.h
+++ b/kwordquiz/src/flashview.h
@@ -55,11 +55,11 @@ private:
WQQuiz *m_quiz;
WTQScore *m_score;
- KAction* actFlip;
- KAction* actKnow;
- KAction* actDontKnow;
- KAction* actRepeat;
- KAction* actRestart;
+ TDEAction* actFlip;
+ TDEAction* actKnow;
+ TDEAction* actDontKnow;
+ TDEAction* actRepeat;
+ TDEAction* actRestart;
TQTimer* m_timer;
diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp
index 8dc0c2ef..a55ea93e 100644
--- a/kwordquiz/src/kwordquiz.cpp
+++ b/kwordquiz/src/kwordquiz.cpp
@@ -54,7 +54,7 @@
#define ID_MENU_QUIZ 1001
-KWordQuizApp::KWordQuizApp(TQWidget* , const char* name):KMainWindow(0, name)
+KWordQuizApp::KWordQuizApp(TQWidget* , const char* name):TDEMainWindow(0, name)
{
///////////////////////////////////////////////////////////////////
@@ -101,9 +101,9 @@ KWordQuizApp::~KWordQuizApp()
void KWordQuizApp::initActions()
{
- KAction* configToolbar;
- KAction* configNotifications;
- KAction* configApp;
+ TDEAction* configToolbar;
+ TDEAction* configNotifications;
+ TDEAction* configApp;
fileNew = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection());
fileNew->setWhatsThis(i18n("Creates a new blank vocabulary document"));
@@ -115,7 +115,7 @@ void KWordQuizApp::initActions()
fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection());
- fileGHNS = new KAction(i18n("&Get New Vocabularies..."), "knewstuff", "CTRL+G", TQT_TQOBJECT(this), TQT_SLOT(slotFileGHNS()), actionCollection(), "file_ghns");
+ fileGHNS = new TDEAction(i18n("&Get New Vocabularies..."), "knewstuff", "CTRL+G", TQT_TQOBJECT(this), TQT_SLOT(slotFileGHNS()), actionCollection(), "file_ghns");
fileGHNS->setWhatsThis(i18n("Downloads new vocabularies"));
fileGHNS->setToolTip(fileGHNS->whatsThis());
@@ -159,51 +159,51 @@ void KWordQuizApp::initActions()
editClear->setWhatsThis(i18n("Clears the content of the selected cells"));
editClear->setToolTip(editClear->whatsThis());
- editInsert = new KAction(i18n("&Insert Row"), "insert_table_row", "CTRL+I", TQT_TQOBJECT(this), TQT_SLOT(slotEditInsert()), actionCollection(),"edit_insert");
+ editInsert = new TDEAction(i18n("&Insert Row"), "insert_table_row", "CTRL+I", TQT_TQOBJECT(this), TQT_SLOT(slotEditInsert()), actionCollection(),"edit_insert");
editInsert->setWhatsThis(i18n("Inserts a new row above the current row"));
editInsert->setToolTip(editInsert->whatsThis());
- editDelete = new KAction(i18n("&Delete Row"), "delete_table_row", "CTRL+K", TQT_TQOBJECT(this), TQT_SLOT(slotEditDelete()), actionCollection(),"edit_delete");
+ editDelete = new TDEAction(i18n("&Delete Row"), "delete_table_row", "CTRL+K", TQT_TQOBJECT(this), TQT_SLOT(slotEditDelete()), actionCollection(),"edit_delete");
editDelete->setWhatsThis(i18n("Deletes the selected row(s)"));
editDelete->setToolTip(editDelete->whatsThis());
- editMarkBlank = new KAction(i18n("&Mark as Blank"), "markasblank", "CTRL+M", TQT_TQOBJECT(this), TQT_SLOT(slotEditMarkBlank()), actionCollection(),"edit_mark_blank");
+ editMarkBlank = new TDEAction(i18n("&Mark as Blank"), "markasblank", "CTRL+M", TQT_TQOBJECT(this), TQT_SLOT(slotEditMarkBlank()), actionCollection(),"edit_mark_blank");
editMarkBlank->setWhatsThis(i18n("Marks the current or selected word as a blank for Fill-in-the-blank"));
editMarkBlank->setToolTip(editMarkBlank->whatsThis());
- editUnmarkBlank = new KAction(i18n("&Unmark Blanks"), "unmarkasblank", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditUnmarkBlank()), actionCollection(),"edit_unmark_blank");
+ editUnmarkBlank = new TDEAction(i18n("&Unmark Blanks"), "unmarkasblank", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditUnmarkBlank()), actionCollection(),"edit_unmark_blank");
editUnmarkBlank->setWhatsThis(i18n("Removes blanks from the current or selected word"));
editUnmarkBlank->setToolTip(editUnmarkBlank->whatsThis());
//@todo implement editFind = KStdAction::find(this, TQT_SLOT(slotEditFind()), actionCollection());
- vocabLanguages = new KAction(i18n("&Column Titles..."), "languages", "CTRL+L", TQT_TQOBJECT(this), TQT_SLOT(slotVocabLanguages()), actionCollection(),"vocab_languages");
+ vocabLanguages = new TDEAction(i18n("&Column Titles..."), "languages", "CTRL+L", TQT_TQOBJECT(this), TQT_SLOT(slotVocabLanguages()), actionCollection(),"vocab_languages");
vocabLanguages->setWhatsThis(i18n("Defines the column titles for the active vocabulary"));
vocabLanguages->setToolTip(vocabLanguages->whatsThis());
- vocabFont = new KAction(i18n("&Font..."), "fonts", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabFont()), actionCollection(),"vocab_font");
+ vocabFont = new TDEAction(i18n("&Font..."), "fonts", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabFont()), actionCollection(),"vocab_font");
vocabFont->setWhatsThis(i18n("Defines the font used by the editor"));
vocabFont->setToolTip(vocabFont->whatsThis());
- //@todo implement vocabKeyboard = new KAction(i18n("&Keyboard..."), "kxkb", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabKeyboard()), actionCollection(),"vocab_keyboard");
+ //@todo implement vocabKeyboard = new TDEAction(i18n("&Keyboard..."), "kxkb", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabKeyboard()), actionCollection(),"vocab_keyboard");
- vocabRC = new KAction(i18n("&Rows/Columns..."), "rowcol", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabRC()), actionCollection(),"vocab_rc");
+ vocabRC = new TDEAction(i18n("&Rows/Columns..."), "rowcol", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabRC()), actionCollection(),"vocab_rc");
vocabRC->setWhatsThis(i18n("Defines the number of rows, row heights, and column widths for the active vocabulary"));
vocabRC->setToolTip(vocabRC->whatsThis());
- vocabSort = new KAction(i18n("&Sort..."), "sort_incr", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabSort()), actionCollection(),"vocab_sort");
+ vocabSort = new TDEAction(i18n("&Sort..."), "sort_incr", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabSort()), actionCollection(),"vocab_sort");
vocabSort->setWhatsThis(i18n("Sorts the vocabulary in ascending or descending order based on the left or right column"));
vocabSort->setToolTip(vocabSort->whatsThis());
- vocabShuffle = new KAction(i18n("Sh&uffle"), "shuffle", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabShuffle()), actionCollection(),"vocab_shuffle");
+ vocabShuffle = new TDEAction(i18n("Sh&uffle"), "shuffle", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabShuffle()), actionCollection(),"vocab_shuffle");
vocabShuffle->setWhatsThis(i18n("Shuffles the entries of the active vocabulary"));
vocabShuffle->setToolTip(vocabShuffle->whatsThis());
- mode = new KToolBarPopupAction(i18n("Change Mode"), "mode1", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode0()), actionCollection(),"mode_0");
+ mode = new TDEToolBarPopupAction(i18n("Change Mode"), "mode1", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode0()), actionCollection(),"mode_0");
mode->setWhatsThis(i18n("Changes the mode used in quiz sessions"));
mode->setToolTip(mode->whatsThis());
- KPopupMenu *popup = mode->popupMenu();
+ TDEPopupMenu *popup = mode->popupMenu();
popup->clear();
popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode1", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), 0, 0);
popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode2", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), 0, 1);
@@ -211,11 +211,11 @@ void KWordQuizApp::initActions()
popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode4", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode4()), 0, 3);
popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode5", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode5()), 0, 4);
- mode1 = new KToggleAction("", "mode1", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), actionCollection(),"mode_1");
- mode2 = new KToggleAction("", "mode2", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), actionCollection(),"mode_2");
- mode3 = new KToggleAction("", "mode3", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode3()), actionCollection(),"mode_3");
- mode4 = new KToggleAction("", "mode4", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode4()), actionCollection(),"mode_4");
- mode5 = new KToggleAction("", "mode5", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode5()), actionCollection(),"mode_5");
+ mode1 = new TDEToggleAction("", "mode1", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), actionCollection(),"mode_1");
+ mode2 = new TDEToggleAction("", "mode2", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), actionCollection(),"mode_2");
+ mode3 = new TDEToggleAction("", "mode3", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode3()), actionCollection(),"mode_3");
+ mode4 = new TDEToggleAction("", "mode4", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode4()), actionCollection(),"mode_4");
+ mode5 = new TDEToggleAction("", "mode5", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode5()), actionCollection(),"mode_5");
mode1->setWhatsThis(i18n("Selects this mode"));
mode2->setWhatsThis(i18n("Selects this mode"));
mode3->setWhatsThis(i18n("Selects this mode"));
@@ -227,43 +227,43 @@ void KWordQuizApp::initActions()
mode4->setToolTip(mode4->whatsThis());
mode5->setToolTip(mode5->whatsThis());
- quizEditor = new KAction(i18n("&Editor"), "editor", "F6", TQT_TQOBJECT(this), TQT_SLOT(slotQuizEditor()), actionCollection(),"quiz_editor");
+ quizEditor = new TDEAction(i18n("&Editor"), "editor", "F6", TQT_TQOBJECT(this), TQT_SLOT(slotQuizEditor()), actionCollection(),"quiz_editor");
quizEditor->setWhatsThis(i18n("Activates the vocabulary editor"));
quizEditor->setToolTip(quizEditor->whatsThis());
- quizFlash = new KAction(i18n("&Flashcard"), "flash", "F7", TQT_TQOBJECT(this), TQT_SLOT(slotQuizFlash()), actionCollection(),"quiz_flash");
+ quizFlash = new TDEAction(i18n("&Flashcard"), "flash", "F7", TQT_TQOBJECT(this), TQT_SLOT(slotQuizFlash()), actionCollection(),"quiz_flash");
quizFlash->setWhatsThis(i18n("Starts a flashcard session using the active vocabulary"));
quizFlash->setToolTip(quizFlash->whatsThis());
- quizMultiple = new KAction(i18n("&Multiple Choice"), "multiple", "F8", TQT_TQOBJECT(this), TQT_SLOT(slotQuizMultiple()), actionCollection(),"quiz_multiple");
+ quizMultiple = new TDEAction(i18n("&Multiple Choice"), "multiple", "F8", TQT_TQOBJECT(this), TQT_SLOT(slotQuizMultiple()), actionCollection(),"quiz_multiple");
quizMultiple->setWhatsThis(i18n("Starts a multiple choice session using the active vocabulary"));
quizMultiple->setToolTip(quizMultiple->whatsThis());
- quizQA = new KAction(i18n("&Question && Answer"), "qa", "F9", TQT_TQOBJECT(this), TQT_SLOT(slotQuizQA()), actionCollection(),"quiz_qa");
+ quizQA = new TDEAction(i18n("&Question && Answer"), "qa", "F9", TQT_TQOBJECT(this), TQT_SLOT(slotQuizQA()), actionCollection(),"quiz_qa");
quizQA->setWhatsThis(i18n("Starts a question and answer session using the active vocabulary"));
quizQA->setToolTip(quizQA->whatsThis());
- quizCheck = new KAction(i18n("&Check"), "check", "Return", TQT_TQOBJECT(this), 0, actionCollection(),"quiz_check");
+ quizCheck = new TDEAction(i18n("&Check"), "check", "Return", TQT_TQOBJECT(this), 0, actionCollection(),"quiz_check");
quizCheck->setWhatsThis(i18n("Checks your answer to this question"));
quizCheck->setToolTip(quizCheck->whatsThis());
- flashKnow = new KAction(i18n("I &Know"), "know", "K", TQT_TQOBJECT(this), 0, actionCollection(),"flash_know");
+ flashKnow = new TDEAction(i18n("I &Know"), "know", "K", TQT_TQOBJECT(this), 0, actionCollection(),"flash_know");
flashKnow->setWhatsThis(i18n("Counts this card as correct and shows the next card"));
flashKnow->setToolTip(flashKnow->whatsThis());
- flashDontKnow = new KAction(i18n("I &Do Not Know"), "dontknow", "D", TQT_TQOBJECT(this), 0, actionCollection(),"flash_dont_know");
+ flashDontKnow = new TDEAction(i18n("I &Do Not Know"), "dontknow", "D", TQT_TQOBJECT(this), 0, actionCollection(),"flash_dont_know");
flashDontKnow->setWhatsThis(i18n("Counts this card as incorrect and shows the next card"));
flashDontKnow->setToolTip(flashDontKnow->whatsThis());
- qaHint = new KAction(i18n("&Hint"), "hint", "CTRL+H", TQT_TQOBJECT(this), 0, actionCollection(),"qa_hint");
+ qaHint = new TDEAction(i18n("&Hint"), "hint", "CTRL+H", TQT_TQOBJECT(this), 0, actionCollection(),"qa_hint");
qaHint->setWhatsThis(i18n("Gets the next correct letter of the answer"));
qaHint->setToolTip(qaHint->whatsThis());
- quizRestart = new KAction(i18n("&Restart"), "restart.png", "CTRL+R", TQT_TQOBJECT(this), 0, actionCollection(), "quiz_restart");
+ quizRestart = new TDEAction(i18n("&Restart"), "restart.png", "CTRL+R", TQT_TQOBJECT(this), 0, actionCollection(), "quiz_restart");
quizRestart->setWhatsThis(i18n("Restarts the quiz session from the beginning"));
quizRestart->setToolTip(quizRestart->whatsThis());
- quizRepeatErrors = new KAction(i18n("Repeat &Errors"), "repeat", "CTRL+E", TQT_TQOBJECT(this), 0, actionCollection(),"quiz_repeat_errors");
+ quizRepeatErrors = new TDEAction(i18n("Repeat &Errors"), "repeat", "CTRL+E", TQT_TQOBJECT(this), 0, actionCollection(),"quiz_repeat_errors");
quizRepeatErrors->setWhatsThis(i18n("Repeats all incorrectly answered questions"));
quizRepeatErrors->setToolTip(quizRepeatErrors->whatsThis());
@@ -278,15 +278,15 @@ void KWordQuizApp::initActions()
charMapper = new TQSignalMapper(TQT_TQOBJECT(this));
connect(charMapper, TQT_SIGNAL(mapped(int)), TQT_TQOBJECT(this), TQT_SLOT(slotInsertChar(int)));
- specialChar1 = new KAction(i18n("Special Character 1"), "", "CTRL+1", charMapper, TQT_SLOT(map()), actionCollection(), "char_1") ;
- specialChar2 = new KAction(i18n("Special Character 2"), 0, "CTRL+2", charMapper, TQT_SLOT(map()), actionCollection(), "char_2") ;
- specialChar3 = new KAction(i18n("Special Character 3"), 0, "CTRL+3", charMapper, TQT_SLOT(map()), actionCollection(), "char_3") ;
- specialChar4 = new KAction(i18n("Special Character 4"), 0, "CTRL+4", charMapper, TQT_SLOT(map()), actionCollection(), "char_4") ;
- specialChar5 = new KAction(i18n("Special Character 5"), 0, "CTRL+5", charMapper, TQT_SLOT(map()), actionCollection(), "char_5") ;
- specialChar6 = new KAction(i18n("Special Character 6"), 0, "CTRL+6", charMapper, TQT_SLOT(map()), actionCollection(), "char_6") ;
- specialChar7 = new KAction(i18n("Special Character 7"), 0, "CTRL+7", charMapper, TQT_SLOT(map()), actionCollection(), "char_7") ;
- specialChar8 = new KAction(i18n("Special Character 8"), 0, "CTRL+8", charMapper, TQT_SLOT(map()), actionCollection(), "char_8") ;
- specialChar9 = new KAction(i18n("Special Character 9"), 0, "CTRL+9", charMapper, TQT_SLOT(map()), actionCollection(), "char_9") ;
+ specialChar1 = new TDEAction(i18n("Special Character 1"), "", "CTRL+1", charMapper, TQT_SLOT(map()), actionCollection(), "char_1") ;
+ specialChar2 = new TDEAction(i18n("Special Character 2"), 0, "CTRL+2", charMapper, TQT_SLOT(map()), actionCollection(), "char_2") ;
+ specialChar3 = new TDEAction(i18n("Special Character 3"), 0, "CTRL+3", charMapper, TQT_SLOT(map()), actionCollection(), "char_3") ;
+ specialChar4 = new TDEAction(i18n("Special Character 4"), 0, "CTRL+4", charMapper, TQT_SLOT(map()), actionCollection(), "char_4") ;
+ specialChar5 = new TDEAction(i18n("Special Character 5"), 0, "CTRL+5", charMapper, TQT_SLOT(map()), actionCollection(), "char_5") ;
+ specialChar6 = new TDEAction(i18n("Special Character 6"), 0, "CTRL+6", charMapper, TQT_SLOT(map()), actionCollection(), "char_6") ;
+ specialChar7 = new TDEAction(i18n("Special Character 7"), 0, "CTRL+7", charMapper, TQT_SLOT(map()), actionCollection(), "char_7") ;
+ specialChar8 = new TDEAction(i18n("Special Character 8"), 0, "CTRL+8", charMapper, TQT_SLOT(map()), actionCollection(), "char_8") ;
+ specialChar9 = new TDEAction(i18n("Special Character 9"), 0, "CTRL+9", charMapper, TQT_SLOT(map()), actionCollection(), "char_9") ;
charMapper->setMapping(specialChar1, 1);
charMapper->setMapping(specialChar2, 2);
@@ -300,7 +300,7 @@ void KWordQuizApp::initActions()
actionCollection()->setHighlightingEnabled(true);
connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &)));
- connect(actionCollection(), TQT_SIGNAL(actionHighlighted(KAction *, bool)), TQT_TQOBJECT(this), TQT_SLOT(slotActionHighlighted(KAction *, bool)));
+ connect(actionCollection(), TQT_SIGNAL(actionHighlighted(TDEAction *, bool)), TQT_TQOBJECT(this), TQT_SLOT(slotActionHighlighted(TDEAction *, bool)));
updateSpecialCharIcons();
if (!initialGeometrySet())
@@ -342,7 +342,7 @@ void KWordQuizApp::openURL(const KURL& url)
if(!url.isEmpty()) {
if (m_dirWatch->contains(url.path()))
{
- KMainWindow* w;
+ TDEMainWindow* w;
if(memberList)
{
for(w=memberList->first(); w!=0; w=memberList->next())
@@ -678,7 +678,7 @@ void KWordQuizApp::slotFileQuit()
saveOptions();
// close the first window, the list makes the next one the first again.
// This ensures that queryClose() is called on each window to ask for closing
- KMainWindow* w;
+ TDEMainWindow* w;
if(memberList)
{
for(w=memberList->first(); w!=0; w=memberList->next())
@@ -787,10 +787,10 @@ void KWordQuizApp::slotVocabLanguages()
void KWordQuizApp::slotVocabFont()
{
slotStatusMsg(i18n("Setting the font of the vocabulary..."));
- KFontDialog* dlg;
- dlg = new KFontDialog(this, "dlg_font", false, true);
+ TDEFontDialog* dlg;
+ dlg = new TDEFontDialog(this, "dlg_font", false, true);
dlg->setFont(m_editView -> font());
- if (dlg->exec() == KFontDialog::Accepted)
+ if (dlg->exec() == TDEFontDialog::Accepted)
{
m_editView ->setFont(dlg->font());
Prefs::setEditorFont(dlg->font());
@@ -1072,7 +1072,7 @@ void KWordQuizApp::slotApplyPreferences()
void KWordQuizApp::updateSpecialCharIcons( )
{
for (int i = 0; i < 9; i++){
- KAction * act = actionCollection()->action(TQString("char_" + TQString::number(i + 1)).latin1());
+ TDEAction * act = actionCollection()->action(TQString("char_" + TQString::number(i + 1)).latin1());
act->setIcon(charIcon(Prefs::specialCharacters()[i]));
act->setToolTip(i18n("Inserts the character %1").arg(Prefs::specialCharacters()[i]));
}
@@ -1157,7 +1157,7 @@ void KWordQuizApp::updateMode(int m)
mode4->setChecked(Prefs::mode() == 4);
mode5->setChecked(Prefs::mode() == 5);
- KPopupMenu *popup = mode->popupMenu();
+ TDEPopupMenu *popup = mode->popupMenu();
popup->setItemChecked(0, Prefs::mode() == 1);
popup->setItemChecked(1, Prefs::mode() == 2);
popup->setItemChecked(2, Prefs::mode() == 3);
@@ -1204,7 +1204,7 @@ void KWordQuizApp::slotInsertChar( int i )
m_editView->slotSpecChar(Prefs::specialCharacters()[i - 1]);
}
-void KWordQuizApp::slotActionHighlighted( KAction * action, bool hl)
+void KWordQuizApp::slotActionHighlighted( TDEAction * action, bool hl)
{
if (!hl)
slotStatusMsg(i18n("Ready"));
diff --git a/kwordquiz/src/kwordquiz.h b/kwordquiz/src/kwordquiz.h
index c04cd92f..86d4772b 100644
--- a/kwordquiz/src/kwordquiz.h
+++ b/kwordquiz/src/kwordquiz.h
@@ -48,16 +48,16 @@ class KWQNewStuff;
* window and reads the config file as well as providing a menubar, toolbar
* and statusbar. An instance of KWordQuizView creates your center view, which is connected
* to the window's Doc object.
- * KWordQuizApp reimplements the methods that KMainWindow provides for main window handling and supports
- * full session management as well as using KActions.
- * @see KMainWindow
+ * KWordQuizApp reimplements the methods that TDEMainWindow provides for main window handling and supports
+ * full session management as well as using TDEActions.
+ * @see TDEMainWindow
* @see TDEApplication
* @see TDEConfig
*
* @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
* @version KDevelop version 1.2 code generation
*/
-class KWordQuizApp : public KMainWindow
+class KWordQuizApp : public TDEMainWindow
{
Q_OBJECT
@@ -86,7 +86,7 @@ class KWordQuizApp : public KMainWindow
/** read general Options again and initialize all variables like the recent file list
*/
void readOptions();
- /** initializes the KActions of the application */
+ /** initializes the TDEActions of the application */
void initActions();
/** sets up the statusbar for the main window by initialzing a statuslabel.
@@ -222,7 +222,7 @@ class KWordQuizApp : public KMainWindow
void slotInsertChar(int i);
- void slotActionHighlighted(KAction *, bool);
+ void slotActionHighlighted(TDEAction *, bool);
void slotContextMenuRequested(int, int, const TQPoint &);
private:
@@ -248,66 +248,66 @@ class KWordQuizApp : public KMainWindow
*/
KWordQuizDoc *doc;
- // KAction pointers to enable/disable actions
- KAction* fileNew;
- KAction* fileOpen;
- KRecentFilesAction* fileOpenRecent;
- KAction* fileGHNS;
- KAction* fileSave;
- KAction* fileSaveAs;
- KAction* fileClose;
- KAction* filePrint;
- KAction* fileQuit;
-
- KAction* editUndo;
- KAction* editCut;
- KAction* editCopy;
- KAction* editPaste;
- KAction* editClear;
- KAction* editInsert;
- KAction* editDelete;
- KAction* editMarkBlank;
- KAction* editUnmarkBlank;
- //KAction* editFind;
-
- KAction* vocabLanguages;
- KAction* vocabFont;
- //KAction* vocabKeyboard;
- KAction* vocabRC;
- KAction* vocabSort;
- KAction* vocabShuffle;
-
- KToolBarPopupAction* mode;
- KToggleAction* mode1;
- KToggleAction* mode2;
- KToggleAction* mode3;
- KToggleAction* mode4;
- KToggleAction* mode5;
-
- KAction* quizEditor;
- KAction* quizFlash;
- KAction* quizMultiple;
- KAction* quizQA;
-
- KAction* quizCheck;
- KAction* quizRestart;
- KAction* quizRepeatErrors;
-
- KAction* flashKnow;
- KAction* flashDontKnow;
-
- KAction* qaHint;
+ // TDEAction pointers to enable/disable actions
+ TDEAction* fileNew;
+ TDEAction* fileOpen;
+ TDERecentFilesAction* fileOpenRecent;
+ TDEAction* fileGHNS;
+ TDEAction* fileSave;
+ TDEAction* fileSaveAs;
+ TDEAction* fileClose;
+ TDEAction* filePrint;
+ TDEAction* fileQuit;
+
+ TDEAction* editUndo;
+ TDEAction* editCut;
+ TDEAction* editCopy;
+ TDEAction* editPaste;
+ TDEAction* editClear;
+ TDEAction* editInsert;
+ TDEAction* editDelete;
+ TDEAction* editMarkBlank;
+ TDEAction* editUnmarkBlank;
+ //TDEAction* editFind;
+
+ TDEAction* vocabLanguages;
+ TDEAction* vocabFont;
+ //TDEAction* vocabKeyboard;
+ TDEAction* vocabRC;
+ TDEAction* vocabSort;
+ TDEAction* vocabShuffle;
+
+ TDEToolBarPopupAction* mode;
+ TDEToggleAction* mode1;
+ TDEToggleAction* mode2;
+ TDEToggleAction* mode3;
+ TDEToggleAction* mode4;
+ TDEToggleAction* mode5;
+
+ TDEAction* quizEditor;
+ TDEAction* quizFlash;
+ TDEAction* quizMultiple;
+ TDEAction* quizQA;
+
+ TDEAction* quizCheck;
+ TDEAction* quizRestart;
+ TDEAction* quizRepeatErrors;
+
+ TDEAction* flashKnow;
+ TDEAction* flashDontKnow;
+
+ TDEAction* qaHint;
TQSignalMapper* charMapper;
- KAction* specialChar1;
- KAction* specialChar2;
- KAction* specialChar3;
- KAction* specialChar4;
- KAction* specialChar5;
- KAction* specialChar6;
- KAction* specialChar7;
- KAction* specialChar8;
- KAction* specialChar9;
+ TDEAction* specialChar1;
+ TDEAction* specialChar2;
+ TDEAction* specialChar3;
+ TDEAction* specialChar4;
+ TDEAction* specialChar5;
+ TDEAction* specialChar6;
+ TDEAction* specialChar7;
+ TDEAction* specialChar8;
+ TDEAction* specialChar9;
KDirWatch * m_dirWatch;
KWQNewStuff * m_newStuff;
diff --git a/kwordquiz/src/kwordquizdoc.h b/kwordquiz/src/kwordquizdoc.h
index 07fbf3f5..b1f30a0e 100644
--- a/kwordquiz/src/kwordquizdoc.h
+++ b/kwordquiz/src/kwordquizdoc.h
@@ -33,7 +33,7 @@ class KWordQuizView;
/** KWordQuizDoc provides a document object for a document-view model.
*
* The KWordQuizDoc class provides a document object that can be used in conjunction with the classes KWordQuizApp and KWordQuizView
- * to create a document-view model for standard TDE applications based on TDEApplication and KMainWindow. Thereby, the document object
+ * to create a document-view model for standard TDE applications based on TDEApplication and TDEMainWindow. Thereby, the document object
* is created by the KWordQuizApp instance and contains the document structure with the according methods for manipulation of the document
* data by KWordQuizView objects. Also, KWordQuizDoc contains the methods for serialization of the document data from and to files.
*
diff --git a/kwordquiz/src/prefcardappearancebase.ui b/kwordquiz/src/prefcardappearancebase.ui
index a051b9de..257c246a 100644
--- a/kwordquiz/src/prefcardappearancebase.ui
+++ b/kwordquiz/src/prefcardappearancebase.ui
@@ -317,7 +317,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="KFontRequester" row="0" column="0">
+ <widget class="TDEFontRequester" row="0" column="0">
<property name="name">
<cstring>kcfg_BackFont</cstring>
</property>
@@ -400,7 +400,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="KFontRequester" row="0" column="0">
+ <widget class="TDEFontRequester" row="0" column="0">
<property name="name">
<cstring>kcfg_FrontFont</cstring>
</property>
diff --git a/kwordquiz/src/qaview.h b/kwordquiz/src/qaview.h
index b747c13c..0b293a72 100644
--- a/kwordquiz/src/qaview.h
+++ b/kwordquiz/src/qaview.h
@@ -53,10 +53,10 @@ private:
WQQuiz *m_quiz;
WTQScore *m_score;
- KAction* actCheck;
- KAction* actHint;
- KAction* actRepeat;
- KAction* actRestart;
+ TDEAction* actCheck;
+ TDEAction* actHint;
+ TDEAction* actRepeat;
+ TDEAction* actRestart;
int m_question;
int m_error;
diff --git a/libtdeedu/extdate/extdatepicker.cpp b/libtdeedu/extdate/extdatepicker.cpp
index e9f2f4fe..e0953ef3 100644
--- a/libtdeedu/extdate/extdatepicker.cpp
+++ b/libtdeedu/extdate/extdatepicker.cpp
@@ -383,7 +383,7 @@ ExtDatePicker::selectYearClicked()
}
int year;
- KPopupFrame* popup = new KPopupFrame(this);
+ TDEPopupFrame* popup = new TDEPopupFrame(this);
ExtDateInternalYearSelector* picker = new ExtDateInternalYearSelector(popup);
// -----
picker->resize(picker->sizeHint());
diff --git a/libtdeedu/extdate/extdatetbl.cpp b/libtdeedu/extdate/extdatetbl.cpp
index 295f1442..eb9f9a51 100644
--- a/libtdeedu/extdate/extdatetbl.cpp
+++ b/libtdeedu/extdate/extdatetbl.cpp
@@ -450,7 +450,7 @@ ExtDateTable::contentsMousePressEvent(TQMouseEvent *e)
if ( e->button() == Qt::RightButton && d->popupMenuEnabled )
{
- KPopupMenu *menu = new KPopupMenu();
+ TDEPopupMenu *menu = new TDEPopupMenu();
//FIXME: Uncomment the following line (and remove the one after it)
// if ExtDate is added to tdelibs
@@ -873,7 +873,7 @@ ExtDateInternalYearSelector::setYear(int year)
setText(temp);
}
-KPopupFrame::KPopupFrame(TQWidget* parent, const char* name)
+TDEPopupFrame::TDEPopupFrame(TQWidget* parent, const char* name)
: TQFrame(parent, name, WType_Popup),
result(0), // rejected
main(0)
@@ -883,7 +883,7 @@ KPopupFrame::KPopupFrame(TQWidget* parent, const char* name)
}
void
-KPopupFrame::keyPressEvent(TQKeyEvent* e)
+TDEPopupFrame::keyPressEvent(TQKeyEvent* e)
{
if(e->key()==Key_Escape)
{
@@ -893,14 +893,14 @@ KPopupFrame::keyPressEvent(TQKeyEvent* e)
}
void
-KPopupFrame::close(int r)
+TDEPopupFrame::close(int r)
{
result=r;
tqApp->exit_loop();
}
void
-KPopupFrame::setMainWidget(TQWidget* m)
+TDEPopupFrame::setMainWidget(TQWidget* m)
{
main=m;
if(main!=0)
@@ -910,7 +910,7 @@ KPopupFrame::setMainWidget(TQWidget* m)
}
void
-KPopupFrame::resizeEvent(TQResizeEvent*)
+TDEPopupFrame::resizeEvent(TQResizeEvent*)
{
if(main!=0)
{
@@ -920,7 +920,7 @@ KPopupFrame::resizeEvent(TQResizeEvent*)
}
void
-KPopupFrame::popup(const TQPoint &pos)
+TDEPopupFrame::popup(const TQPoint &pos)
{
// Make sure the whole popup is visible.
TQRect d = TDEGlobalSettings::desktopGeometry(pos);
@@ -944,7 +944,7 @@ KPopupFrame::popup(const TQPoint &pos)
}
int
-KPopupFrame::exec(TQPoint pos)
+TDEPopupFrame::exec(TQPoint pos)
{
popup(pos);
repaint();
@@ -954,12 +954,12 @@ KPopupFrame::exec(TQPoint pos)
}
int
-KPopupFrame::exec(int x, int y)
+TDEPopupFrame::exec(int x, int y)
{
return exec(TQPoint(x, y));
}
-void KPopupFrame::virtual_hook( int, void* )
+void TDEPopupFrame::virtual_hook( int, void* )
{ /*BASE::virtual_hook( id, data );*/ }
void ExtDateTable::virtual_hook( int, void* )
diff --git a/libtdeedu/extdate/extdatetbl.h b/libtdeedu/extdate/extdatetbl.h
index 06aa0122..99ce6a69 100644
--- a/libtdeedu/extdate/extdatetbl.h
+++ b/libtdeedu/extdate/extdatetbl.h
@@ -31,7 +31,7 @@
#include <klineedit.h>
#include "extcalendarsystemgregorian.h"
-class KPopupMenu;
+class TDEPopupMenu;
/** Week selection widget.
* @internal
@@ -177,7 +177,7 @@ private:
* @author Tim Gilman, Mirko Boehm
* @version $Id$
*/
-class KPopupFrame : public TQFrame
+class TDEPopupFrame : public TQFrame
{
Q_OBJECT
@@ -204,7 +204,7 @@ public:
/**
* The contructor. Creates a dialog without buttons.
*/
- KPopupFrame(TQWidget* parent=0, const char* name=0);
+ TDEPopupFrame(TQWidget* parent=0, const char* name=0);
/**
* Set the main widget. You cannot set the main widget from the constructor,
* since it must be a child of the frame itselfes.
@@ -237,8 +237,8 @@ private:
protected:
virtual void virtual_hook( int id, void* data );
private:
- class KPopupFramePrivate;
- KPopupFramePrivate *d;
+ class TDEPopupFramePrivate;
+ TDEPopupFramePrivate *d;
};
/**
@@ -420,7 +420,7 @@ signals:
*
* @since 3.2
*/
- void aboutToShowContextMenu( KPopupMenu * menu, const ExtDate &date);
+ void aboutToShowContextMenu( TDEPopupMenu * menu, const ExtDate &date);
protected:
virtual void virtual_hook( int id, void* data );
diff --git a/libtdeedu/extdate/testwidget.cpp b/libtdeedu/extdate/testwidget.cpp
index 0267ddeb..8a517c4a 100644
--- a/libtdeedu/extdate/testwidget.cpp
+++ b/libtdeedu/extdate/testwidget.cpp
@@ -25,7 +25,7 @@
#include "extdatewidget.h"
#include "testwidget.h"
-TestWidget::TestWidget( TQWidget *p=0, const char *name=0 ) : KMainWindow( p, name ) {
+TestWidget::TestWidget( TQWidget *p=0, const char *name=0 ) : TDEMainWindow( p, name ) {
TQWidget *w = new TQWidget(this);
glay = new TQGridLayout(w, 3, 2);
diff --git a/libtdeedu/extdate/testwidget.h b/libtdeedu/extdate/testwidget.h
index c05e74ea..82118881 100644
--- a/libtdeedu/extdate/testwidget.h
+++ b/libtdeedu/extdate/testwidget.h
@@ -29,7 +29,7 @@ class TQGridLayout;
class TQDate;
class ExtDate;
-class TestWidget : public KMainWindow {
+class TestWidget : public TDEMainWindow {
Q_OBJECT
public:
diff --git a/libtdeedu/tdeeduui/tdeeduglossary.cpp b/libtdeedu/tdeeduui/tdeeduglossary.cpp
index 2b47961e..b0caca67 100644
--- a/libtdeedu/tdeeduui/tdeeduglossary.cpp
+++ b/libtdeedu/tdeeduui/tdeeduglossary.cpp
@@ -185,7 +185,7 @@ GlossaryDialog::GlossaryDialog( bool folded, TQWidget *parent, const char *name)
lbl->setText( i18n( "Search:" ) );
hbox->addWidget( lbl );
- m_search = new KListViewSearchLine( plainPage(), 0, "search-line" );
+ m_search = new TDEListViewSearchLine( plainPage(), 0, "search-line" );
hbox->addWidget( m_search );
vbox->addLayout( hbox );
setFocusProxy(m_search);
@@ -193,7 +193,7 @@ GlossaryDialog::GlossaryDialog( bool folded, TQWidget *parent, const char *name)
TQSplitter *vs = new TQSplitter( plainPage() );
vbox->addWidget( vs );
- m_glosstree = new KListView( vs, "treeview" );
+ m_glosstree = new TDEListView( vs, "treeview" );
m_glosstree->addColumn( "entries" );
m_glosstree->header()->hide();
m_glosstree->setFullWidth( true );
diff --git a/libtdeedu/tdeeduui/tdeeduglossary.h b/libtdeedu/tdeeduui/tdeeduglossary.h
index acb27334..1307f97e 100644
--- a/libtdeedu/tdeeduui/tdeeduglossary.h
+++ b/libtdeedu/tdeeduui/tdeeduglossary.h
@@ -22,9 +22,9 @@
class TQChar;
class TQDomDocument;
class TQListViewItem;
-class KListView;
-class KListViewSearchLine;
-class KActionCollection;
+class TDEListView;
+class TDEListViewSearchLine;
+class TDEActionCollection;
class GlossaryItem;
/**
@@ -266,14 +266,14 @@ class GlossaryDialog : public KDialogBase
void updateTree();
TDEHTMLPart *m_htmlpart;
- KListView *m_glosstree;
+ TDEListView *m_glosstree;
TQString m_htmlbasestring;
- KActionCollection* m_actionCollection;
+ TDEActionCollection* m_actionCollection;
TQListViewItem* findTreeWithLetter( const TQChar&, TQListViewItem* );
- KListViewSearchLine *m_search;
+ TDEListViewSearchLine *m_search;
private slots:
void slotClicked( TQListViewItem * );