|
|
@ -26,7 +26,7 @@
|
|
|
|
#include "preferences.h"
|
|
|
|
#include "preferences.h"
|
|
|
|
#include <string>
|
|
|
|
#include <string>
|
|
|
|
#include <twin.h>
|
|
|
|
#include <twin.h>
|
|
|
|
#include <kuniqueapplication.h>
|
|
|
|
#include <tdeuniqueapplication.h>
|
|
|
|
#include <tdeaboutdata.h>
|
|
|
|
#include <tdeaboutdata.h>
|
|
|
|
#include <tdecmdlineargs.h>
|
|
|
|
#include <tdecmdlineargs.h>
|
|
|
|
#include <tdelocale.h>
|
|
|
|
#include <tdelocale.h>
|
|
|
@ -77,7 +77,7 @@ extern TQValueVector<TQString> recent_units_pre;
|
|
|
|
|
|
|
|
|
|
|
|
TQTimer *error_timer;
|
|
|
|
TQTimer *error_timer;
|
|
|
|
|
|
|
|
|
|
|
|
void create_qalculate_window(KUniqueApplication *parent) {
|
|
|
|
void create_qalculate_window(TDEUniqueApplication *parent) {
|
|
|
|
|
|
|
|
|
|
|
|
TQTextCodec::setCodecForCStrings(TQTextCodec::codecForName("utf8"));
|
|
|
|
TQTextCodec::setCodecForCStrings(TQTextCodec::codecForName("utf8"));
|
|
|
|
|
|
|
|
|
|
|
@ -223,7 +223,7 @@ void start_qalculate() {
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
class QalculateApp : public KUniqueApplication {
|
|
|
|
class QalculateApp : public TDEUniqueApplication {
|
|
|
|
|
|
|
|
|
|
|
|
public:
|
|
|
|
public:
|
|
|
|
|
|
|
|
|
|
|
@ -276,7 +276,7 @@ public:
|
|
|
|
start_qalculate();
|
|
|
|
start_qalculate();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
started = true;
|
|
|
|
started = true;
|
|
|
|
return KUniqueApplication::newInstance();
|
|
|
|
return TDEUniqueApplication::newInstance();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
started = true;
|
|
|
|
started = true;
|
|
|
|
return 0;
|
|
|
|
return 0;
|
|
|
@ -292,7 +292,7 @@ int main(int argc, char **argv) {
|
|
|
|
about.addAuthor("Niklas Knutsson", 0, "nq@altern.org");
|
|
|
|
about.addAuthor("Niklas Knutsson", 0, "nq@altern.org");
|
|
|
|
TDECmdLineArgs::init(argc, argv, &about);
|
|
|
|
TDECmdLineArgs::init(argc, argv, &about);
|
|
|
|
TDECmdLineArgs::addCmdLineOptions(options);
|
|
|
|
TDECmdLineArgs::addCmdLineOptions(options);
|
|
|
|
KUniqueApplication::addCmdLineOptions();
|
|
|
|
TDEUniqueApplication::addCmdLineOptions();
|
|
|
|
|
|
|
|
|
|
|
|
if(!QalculateApp::start()) {
|
|
|
|
if(!QalculateApp::start()) {
|
|
|
|
return 0;
|
|
|
|
return 0;
|
|
|
|