diff options
Diffstat (limited to 'kalzium')
-rw-r--r-- | kalzium/src/detailinfodlg.cpp | 2 | ||||
-rw-r--r-- | kalzium/src/detailinfodlg.h | 4 | ||||
-rw-r--r-- | kalzium/src/elementdataviewer.cpp | 2 | ||||
-rw-r--r-- | kalzium/src/elementdataviewer.h | 4 | ||||
-rw-r--r-- | kalzium/src/kalzium.cpp | 30 | ||||
-rw-r--r-- | kalzium/src/kalzium.h | 36 | ||||
-rw-r--r-- | kalzium/src/molcalcwidget.h | 2 |
7 files changed, 40 insertions, 40 deletions
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; |