diff options
Diffstat (limited to 'src/kqalculate.cpp')
| -rw-r--r-- | src/kqalculate.cpp | 34 |
1 files changed, 17 insertions, 17 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")); |