summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/kqalculate.cpp34
-rw-r--r--src/qalculateeditfunctiondialog.cpp2
-rw-r--r--src/qalculateeditmatrixvectordialog.cpp2
-rw-r--r--src/qalculateeditunitdialog.cpp2
-rw-r--r--src/qalculateeditunknownvariabledialog.cpp2
-rw-r--r--src/qalculateeditvariabledialog.cpp2
-rw-r--r--src/qalculateexportcsvdialog.cpp2
-rw-r--r--src/qalculatefunctionsdialog.cpp2
-rw-r--r--src/qalculateimportcsvdialog.cpp2
-rw-r--r--src/qalculateplotdialog.cpp2
-rw-r--r--src/qalculateresultdisplay.cpp6
-rw-r--r--src/qalculateunitsdialog.cpp2
-rw-r--r--src/qalculatevariablesdialog.cpp2
13 files changed, 31 insertions, 31 deletions
diff --git a/src/kqalculate.cpp b/src/kqalculate.cpp
index 535742d..32e22ea 100644
--- a/src/kqalculate.cpp
+++ b/src/kqalculate.cpp
@@ -194,7 +194,7 @@ const MathStructure *KQalculate::getResultPart(int i) {
#include <kiconloader.h>
#include <tdeconfig.h>
TQPixmap loadSystrayIcon(const TQString &icon) {
- TDEConfig *appCfg = kapp->config();
+ TDEConfig *appCfg = tdeApp->config();
TDEConfigGroupSaver configSaver(appCfg, "System Tray");
int iconWidth = appCfg->readNumEntry("systrayIconWidth", 22);
return TDEGlobal::instance()->iconLoader()->loadIcon(icon, TDEIcon::Panel, iconWidth);
@@ -285,7 +285,7 @@ KQalculate::KQalculate(TDEUniqueApplication *parent, const char* name, WFlags fl
if(use_button_pixmaps) leftButtonsLayout = new TQVBoxLayout(0, 0, 3);
else leftButtonsLayout = new TQVBoxLayout(0, 0, 6);
- if(use_button_pixmaps) executeButton = new QalculateButton(TDEApplication::kApplication()->iconLoader()->loadIconSet("application-x-executable", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", centralWidget());
+ if(use_button_pixmaps) executeButton = new QalculateButton(tdeApp->iconLoader()->loadIconSet("application-x-executable", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", centralWidget());
else if(rpn_mode) executeButton = new QalculateButton(i18n("Enter"), centralWidget());
else executeButton = new QalculateButton(i18n("="), centralWidget());
executeButton->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed, false);
@@ -295,12 +295,12 @@ KQalculate::KQalculate(TDEUniqueApplication *parent, const char* name, WFlags fl
leftButtonsSeparator = new KSeparator(TQt::Horizontal, centralWidget());
leftButtonsLayout->addWidget(leftButtonsSeparator);
if(use_button_pixmaps) leftButtonsSeparator->hide();
- if(use_button_pixmaps) storeButton = new QalculateButton(TDEApplication::kApplication()->iconLoader()->loadIconSet("document-save-as", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", centralWidget());
+ if(use_button_pixmaps) storeButton = new QalculateButton(tdeApp->iconLoader()->loadIconSet("document-save-as", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", centralWidget());
else storeButton = new QalculateButton(i18n("Store"), centralWidget());
storeButton->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed, false);
TQToolTip::add(storeButton, i18n("Store result as variable"));
leftButtonsLayout->addWidget(storeButton);
- if(use_button_pixmaps) convertButton = new QalculateButton(TDEApplication::kApplication()->iconLoader()->loadIconSet("qalculate_convert", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", centralWidget());
+ if(use_button_pixmaps) convertButton = new QalculateButton(tdeApp->iconLoader()->loadIconSet("qalculate_convert", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", centralWidget());
else convertButton = new QalculateButton(i18n("Convert"), centralWidget());
convertButton->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed, false);
TQToolTip::add(convertButton, i18n("Convert units in result"));
@@ -554,27 +554,27 @@ KQalculate::KQalculate(TDEUniqueApplication *parent, const char* name, WFlags fl
stackPageLayout->addWidget(stackList);
if(use_button_pixmaps) stackPageButtonsLayout = new TQVBoxLayout(stackPageLayout, 3);
else stackPageButtonsLayout = new TQVBoxLayout(stackPageLayout, 6);
- if(use_button_pixmaps) registerUpButton = new QalculateButton(TDEApplication::kApplication()->iconLoader()->loadIconSet("go-up", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", stackPage);
+ if(use_button_pixmaps) registerUpButton = new QalculateButton(tdeApp->iconLoader()->loadIconSet("go-up", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", stackPage);
else registerUpButton = new QalculateButton(i18n("Up"), stackPage);
TQToolTip::add(registerUpButton, i18n("Move selected register up"));
registerUpButton->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed, false);
stackPageButtonsLayout->addWidget(registerUpButton);
- if(use_button_pixmaps) registerDownButton = new QalculateButton(TDEApplication::kApplication()->iconLoader()->loadIconSet("go-down", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", stackPage);
+ if(use_button_pixmaps) registerDownButton = new QalculateButton(tdeApp->iconLoader()->loadIconSet("go-down", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", stackPage);
else registerDownButton = new QalculateButton(i18n("Down"), stackPage);
TQToolTip::add(registerDownButton, i18n("Move selected register down"));
registerDownButton->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed, false);
stackPageButtonsLayout->addWidget(registerDownButton);
- if(use_button_pixmaps) editRegisterButton = new QalculateButton(TDEApplication::kApplication()->iconLoader()->loadIconSet("edit", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", stackPage);
+ if(use_button_pixmaps) editRegisterButton = new QalculateButton(tdeApp->iconLoader()->loadIconSet("edit", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", stackPage);
else editRegisterButton = new QalculateButton(i18n("Edit"), stackPage);
TQToolTip::add(editRegisterButton, i18n("Edit value of selected register"));
editRegisterButton->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed, false);
stackPageButtonsLayout->addWidget(editRegisterButton);
- if(use_button_pixmaps) deleteRegisterButton = new QalculateButton(TDEApplication::kApplication()->iconLoader()->loadIconSet("edit-delete", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", stackPage);
+ if(use_button_pixmaps) deleteRegisterButton = new QalculateButton(tdeApp->iconLoader()->loadIconSet("edit-delete", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", stackPage);
else deleteRegisterButton = new QalculateButton(i18n("Delete"), stackPage);
TQToolTip::add(deleteRegisterButton, i18n("Delete selected register"));
deleteRegisterButton->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed, false);
stackPageButtonsLayout->addWidget(deleteRegisterButton);
- if(use_button_pixmaps) clearStackButton = new QalculateButton(TDEApplication::kApplication()->iconLoader()->loadIconSet("view_remove", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", stackPage);
+ if(use_button_pixmaps) clearStackButton = new QalculateButton(tdeApp->iconLoader()->loadIconSet("view_remove", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", stackPage);
else clearStackButton = new QalculateButton(i18n("Clear"), stackPage);
TQToolTip::add(clearStackButton, i18n("Clear the RPN stack"));
clearStackButton->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed, false);
@@ -5896,23 +5896,23 @@ void KQalculate::applyPreferences() {
if(use_button_pixmaps) {
leftButtonsLayout->setSpacing(3);
executeButton->setText("");
- executeButton->setIconSet(TDEApplication::kApplication()->iconLoader()->loadIconSet("application-x-executable", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
+ executeButton->setIconSet(tdeApp->iconLoader()->loadIconSet("application-x-executable", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
storeButton->setText("");
- storeButton->setIconSet(TDEApplication::kApplication()->iconLoader()->loadIconSet("document-save-as", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
+ storeButton->setIconSet(tdeApp->iconLoader()->loadIconSet("document-save-as", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
convertButton->setText("");
- convertButton->setIconSet(TDEApplication::kApplication()->iconLoader()->loadIconSet("qalculate_convert", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
+ convertButton->setIconSet(tdeApp->iconLoader()->loadIconSet("qalculate_convert", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
leftButtonsSeparator->hide();
stackPageButtonsLayout->setSpacing(3);
registerUpButton->setText("");
- registerUpButton->setIconSet(TDEApplication::kApplication()->iconLoader()->loadIconSet("go-up", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
+ registerUpButton->setIconSet(tdeApp->iconLoader()->loadIconSet("go-up", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
registerDownButton->setText("");
- registerDownButton->setIconSet(TDEApplication::kApplication()->iconLoader()->loadIconSet("go-down", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
+ registerDownButton->setIconSet(tdeApp->iconLoader()->loadIconSet("go-down", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
editRegisterButton->setText("");
- editRegisterButton->setIconSet(TDEApplication::kApplication()->iconLoader()->loadIconSet("edit", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
+ editRegisterButton->setIconSet(tdeApp->iconLoader()->loadIconSet("edit", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
deleteRegisterButton->setText("");
- deleteRegisterButton->setIconSet(TDEApplication::kApplication()->iconLoader()->loadIconSet("edit-delete", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
+ deleteRegisterButton->setIconSet(tdeApp->iconLoader()->loadIconSet("edit-delete", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
clearStackButton->setText("");
- clearStackButton->setIconSet(TDEApplication::kApplication()->iconLoader()->loadIconSet("view_remove", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
+ clearStackButton->setIconSet(tdeApp->iconLoader()->loadIconSet("view_remove", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
} else {
leftButtonsLayout->setSpacing(6);
if(rpn_mode) executeButton->setText(i18n("Enter"));
diff --git a/src/qalculateeditfunctiondialog.cpp b/src/qalculateeditfunctiondialog.cpp
index 13f8803..81bc9ca 100644
--- a/src/qalculateeditfunctiondialog.cpp
+++ b/src/qalculateeditfunctiondialog.cpp
@@ -153,7 +153,7 @@ QalculateEditFunctionDialog::~QalculateEditFunctionDialog() {}
void QalculateEditFunctionDialog::slotHelp() {
- TDEApplication::kApplication()->invokeHelp("qalculate-function-creation");
+ tdeApp->invokeHelp("qalculate-function-creation");
}
void QalculateEditFunctionDialog::argumentSelectionChanged() {
diff --git a/src/qalculateeditmatrixvectordialog.cpp b/src/qalculateeditmatrixvectordialog.cpp
index 3f61c31..7da4dd7 100644
--- a/src/qalculateeditmatrixvectordialog.cpp
+++ b/src/qalculateeditmatrixvectordialog.cpp
@@ -126,7 +126,7 @@ QalculateEditMatrixVectorDialog::QalculateEditMatrixVectorDialog(TQWidget *paren
QalculateEditMatrixVectorDialog::~QalculateEditMatrixVectorDialog() {}
void QalculateEditMatrixVectorDialog::slotHelp() {
- TDEApplication::kApplication()->invokeHelp("qalculate-vectors-matrices");
+ tdeApp->invokeHelp("qalculate-vectors-matrices");
}
void QalculateEditMatrixVectorDialog::typeChanged(int i) {
diff --git a/src/qalculateeditunitdialog.cpp b/src/qalculateeditunitdialog.cpp
index edc8a63..745ea77 100644
--- a/src/qalculateeditunitdialog.cpp
+++ b/src/qalculateeditunitdialog.cpp
@@ -135,7 +135,7 @@ QalculateEditUnitDialog::QalculateEditUnitDialog(TQWidget *parent, const char *n
QalculateEditUnitDialog::~QalculateEditUnitDialog() {}
void QalculateEditUnitDialog::slotHelp() {
- TDEApplication::kApplication()->invokeHelp("qalculate-unit-creation");
+ tdeApp->invokeHelp("qalculate-unit-creation");
}
void QalculateEditUnitDialog::slotOk() {
diff --git a/src/qalculateeditunknownvariabledialog.cpp b/src/qalculateeditunknownvariabledialog.cpp
index 1d2389e..4f28553 100644
--- a/src/qalculateeditunknownvariabledialog.cpp
+++ b/src/qalculateeditunknownvariabledialog.cpp
@@ -121,7 +121,7 @@ void QalculateEditUnknownVariableDialog::signComboActivated(int i) {
}
void QalculateEditUnknownVariableDialog::slotHelp() {
- TDEApplication::kApplication()->invokeHelp("qalculate-variable-creation");
+ tdeApp->invokeHelp("qalculate-variable-creation");
}
void QalculateEditUnknownVariableDialog::slotOk() {
diff --git a/src/qalculateeditvariabledialog.cpp b/src/qalculateeditvariabledialog.cpp
index f9805a0..15ca825 100644
--- a/src/qalculateeditvariabledialog.cpp
+++ b/src/qalculateeditvariabledialog.cpp
@@ -91,7 +91,7 @@ QalculateEditVariableDialog::QalculateEditVariableDialog(TQWidget *parent, const
QalculateEditVariableDialog::~QalculateEditVariableDialog() {}
void QalculateEditVariableDialog::slotHelp() {
- TDEApplication::kApplication()->invokeHelp("qalculate-variable-creation");
+ tdeApp->invokeHelp("qalculate-variable-creation");
}
void QalculateEditVariableDialog::slotOk() {
diff --git a/src/qalculateexportcsvdialog.cpp b/src/qalculateexportcsvdialog.cpp
index a5b2e4f..23e8aa9 100644
--- a/src/qalculateexportcsvdialog.cpp
+++ b/src/qalculateexportcsvdialog.cpp
@@ -76,7 +76,7 @@ QalculateExportCSVDialog::QalculateExportCSVDialog(TQWidget *parent, const char
QalculateExportCSVDialog::~QalculateExportCSVDialog() {}
void QalculateExportCSVDialog::slotHelp() {
- TDEApplication::kApplication()->invokeHelp("qalculate-import-export-csv");
+ tdeApp->invokeHelp("qalculate-import-export-csv");
}
void QalculateExportCSVDialog::exportSourceChanged(int i) {
diff --git a/src/qalculatefunctionsdialog.cpp b/src/qalculatefunctionsdialog.cpp
index 3028565..ae9175f 100644
--- a/src/qalculatefunctionsdialog.cpp
+++ b/src/qalculatefunctionsdialog.cpp
@@ -110,7 +110,7 @@ QalculateFunctionsDialog::~QalculateFunctionsDialog() {
}
void QalculateFunctionsDialog::slotHelp() {
- TDEApplication::kApplication()->invokeHelp("qalculate-managers");
+ tdeApp->invokeHelp("qalculate-managers");
}
void QalculateFunctionsDialog::updateFunctionTree() {
diff --git a/src/qalculateimportcsvdialog.cpp b/src/qalculateimportcsvdialog.cpp
index a05415f..d09728f 100644
--- a/src/qalculateimportcsvdialog.cpp
+++ b/src/qalculateimportcsvdialog.cpp
@@ -101,7 +101,7 @@ QalculateImportCSVDialog::~QalculateImportCSVDialog() {
}
void QalculateImportCSVDialog::slotHelp() {
- TDEApplication::kApplication()->invokeHelp("qalculate-import-export-csv");
+ tdeApp->invokeHelp("qalculate-import-export-csv");
}
void QalculateImportCSVDialog::delimiterChanged(int i) {
diff --git a/src/qalculateplotdialog.cpp b/src/qalculateplotdialog.cpp
index 1e26fd1..9ef7031 100644
--- a/src/qalculateplotdialog.cpp
+++ b/src/qalculateplotdialog.cpp
@@ -317,7 +317,7 @@ QalculatePlotDialog::QalculatePlotDialog(TQWidget *parent, const char *name) : K
QalculatePlotDialog::~QalculatePlotDialog() {}
void QalculatePlotDialog::slotHelp() {
- TDEApplication::kApplication()->invokeHelp("qalculate-plotting");
+ tdeApp->invokeHelp("qalculate-plotting");
}
void QalculatePlotDialog::saveMode() {
diff --git a/src/qalculateresultdisplay.cpp b/src/qalculateresultdisplay.cpp
index b8b95b2..a85c90e 100644
--- a/src/qalculateresultdisplay.cpp
+++ b/src/qalculateresultdisplay.cpp
@@ -239,8 +239,8 @@ QalculateResultDisplay::QalculateResultDisplay(TQWidget *parent, const char *nam
//connect(this, TQ_SIGNAL(anchorClicked(const TQString&, const TQString&)), this, TQ_SLOT(onAnchorClicked(const TQString&, const TQString&)));
connect(this, TQ_SIGNAL(doubleClicked(int, int)), this, TQ_SLOT(onDoubleClicked(int, int)));
- if(kapp) {
- connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(paletteChanged()));
+ if(tdeApp) {
+ connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(paletteChanged()));
}
}
@@ -400,7 +400,7 @@ void QalculateResultDisplay::editMatrix() {
}
void QalculateResultDisplay::paletteChanged() {
- TQPalette p = kapp ? kapp->palette() : palette();
+ TQPalette p = tdeApp ? tdeApp->palette() : palette();
p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Active, TQColorGroup::Background));
p.setColor(TQColorGroup::Text, p.color(TQPalette::Active, TQColorGroup::Foreground));
setPalette(p);
diff --git a/src/qalculateunitsdialog.cpp b/src/qalculateunitsdialog.cpp
index b20b7a2..8dc2375 100644
--- a/src/qalculateunitsdialog.cpp
+++ b/src/qalculateunitsdialog.cpp
@@ -141,7 +141,7 @@ QalculateUnitsDialog::~QalculateUnitsDialog() {
}
void QalculateUnitsDialog::slotHelp() {
- TDEApplication::kApplication()->invokeHelp("qalculate-managers");
+ tdeApp->invokeHelp("qalculate-managers");
}
void QalculateUnitsDialog::updateUnitTree() {
diff --git a/src/qalculatevariablesdialog.cpp b/src/qalculatevariablesdialog.cpp
index 53f9b6f..b478058 100644
--- a/src/qalculatevariablesdialog.cpp
+++ b/src/qalculatevariablesdialog.cpp
@@ -108,7 +108,7 @@ QalculateVariablesDialog::QalculateVariablesDialog(TQWidget *parent, const char
QalculateVariablesDialog::~QalculateVariablesDialog() {}
void QalculateVariablesDialog::slotHelp() {
- TDEApplication::kApplication()->invokeHelp("qalculate-managers");
+ tdeApp->invokeHelp("qalculate-managers");
}
void QalculateVariablesDialog::updateVariableTree() {
generated by cgit v1.2.1 (git 2.18.0) at 2025-02-15 07:15:13 +0000