diff --git a/src/kqalculate.cpp b/src/kqalculate.cpp index d14dd97..535742d 100644 --- a/src/kqalculate.cpp +++ b/src/kqalculate.cpp @@ -54,7 +54,7 @@ #include #include -#include +#include #include #include #include @@ -212,7 +212,7 @@ void ModeObject::loadMode() { mainWin->loadMode(i_mode); } -KQalculate::KQalculate(KUniqueApplication *parent, const char* name, WFlags fl) : TDEMainWindow(0, name, fl) { +KQalculate::KQalculate(TDEUniqueApplication *parent, const char* name, WFlags fl) : TDEMainWindow(0, name, fl) { if(!name) setName("kqalculate"); diff --git a/src/kqalculate.h b/src/kqalculate.h index f375e47..59a086f 100644 --- a/src/kqalculate.h +++ b/src/kqalculate.h @@ -79,7 +79,7 @@ class TQRadioButton; class QalculateButton; class TQVBoxLayout; class KSeparator; -class KUniqueApplication; +class TDEUniqueApplication; class TDEConfig; class TQListViewItem; class QalculateRPNStackListView; @@ -116,7 +116,7 @@ class KQalculate : public TDEMainWindow { public: - KQalculate(KUniqueApplication *parent = 0, const char* name = 0, WFlags fl = WType_TopLevel | WDestructiveClose); + KQalculate(TDEUniqueApplication *parent = 0, const char* name = 0, WFlags fl = WType_TopLevel | WDestructiveClose); virtual ~KQalculate(); void setupActions(); @@ -193,7 +193,7 @@ public: TQVBoxLayout *stackPageButtonsLayout; QalculateButton *registerUpButton, *registerDownButton, *deleteRegisterButton, *editRegisterButton, *clearStackButton; TQPopupMenu *stackMenu; - KUniqueApplication *m_parent; + TDEUniqueApplication *m_parent; KSystemTray *trayicon; QalculateButton *executeButton, *storeButton, *convertButton; QalculateButton *functionsButton; diff --git a/src/main.cpp b/src/main.cpp index dc58a17..9ebaa7d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -26,7 +26,7 @@ #include "preferences.h" #include #include -#include +#include #include #include #include @@ -77,7 +77,7 @@ extern TQValueVector recent_units_pre; TQTimer *error_timer; -void create_qalculate_window(KUniqueApplication *parent) { +void create_qalculate_window(TDEUniqueApplication *parent) { TQTextCodec::setCodecForCStrings(TQTextCodec::codecForName("utf8")); @@ -223,7 +223,7 @@ void start_qalculate() { } -class QalculateApp : public KUniqueApplication { +class QalculateApp : public TDEUniqueApplication { public: @@ -276,7 +276,7 @@ public: start_qalculate(); } started = true; - return KUniqueApplication::newInstance(); + return TDEUniqueApplication::newInstance(); } started = true; return 0; @@ -292,7 +292,7 @@ int main(int argc, char **argv) { about.addAuthor("Niklas Knutsson", 0, "nq@altern.org"); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); if(!QalculateApp::start()) { return 0;