From 544c4714a4e1f6b5bedf7b58d07080c5a6dee860 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sat, 5 Nov 2011 03:24:22 +0200 Subject: fixed config files access path's added code for qtsingleapplication for future also, i can't reproduce crashes --- client/Config.cpp | 9 +++--- client/ProxyClientApp.h | 3 +- client/client.h | 3 ++ client/client.pro | 60 ++++++++++++++++++++++++---------------- client/main.cpp | 6 ++-- server/proxy_ui_server.workspace | 8 ++++++ 6 files changed, 57 insertions(+), 32 deletions(-) mode change 100644 => 100755 client/Config.cpp mode change 100644 => 100755 client/ProxyClientApp.h mode change 100644 => 100755 client/client.h mode change 100644 => 100755 client/client.pro mode change 100644 => 100755 client/main.cpp diff --git a/client/Config.cpp b/client/Config.cpp old mode 100644 new mode 100755 index ee8b9da..8df5fa0 --- a/client/Config.cpp +++ b/client/Config.cpp @@ -23,7 +23,7 @@ Config::Config(): QObject(), StaticProxySpeedLow(50) configValid = false; Logger::Info("Parsing config.cfg to determine initial configuration\n"); - ifstream configFile("config.cfg", std::ios::in); + ifstream configFile(QString(this_app->applicationDirPath()+ "/config.cfg").toUtf8().data(), std::ios::in); if (!configFile) { Logger::Fatal("Can't open file: config.cfg\n"); @@ -236,8 +236,7 @@ unsigned Config::GetStaticProxyGuiLines() int Config::ReadGenericProxy() { Logger::Info("Parsing generic proxy list\n"); - - ifstream proxyFile("./config/proxy_list.cfg", std::ios::in); + ifstream proxyFile(QString(this_app->applicationDirPath()+"./config/proxy_list.cfg").toUtf8().data(), std::ios::in); if (!proxyFile) { Logger::Error("Can't open file ./config/proxy_list.cfg"); @@ -265,7 +264,7 @@ int Config::ReadStaticProxy() { Logger::Info("Parsing static proxy list\n"); - ifstream proxyFile("./config/static_proxy_list.cfg", std::ios::in); + ifstream proxyFile(QString(this_app->applicationDirPath() + "./config/static_proxy_list.cfg").toUtf8().data(), std::ios::in); if (!proxyFile) { Logger::Error("Can't open file ./config/static_proxy_list.cfg\n"); @@ -326,4 +325,4 @@ Config::ServerEntry::ServerEntry(string entry) start = end+1; end = entry.find(' '); retry = atoi(entry.substr(start, end).c_str()); -} \ No newline at end of file +} diff --git a/client/ProxyClientApp.h b/client/ProxyClientApp.h old mode 100644 new mode 100755 index c3c56af..a40177a --- a/client/ProxyClientApp.h +++ b/client/ProxyClientApp.h @@ -6,6 +6,7 @@ #include #include +//class ProxyClientApp: public QtSingleApplication //this will be paid later ))) class ProxyClientApp: public QApplication { Q_OBJECT @@ -18,4 +19,4 @@ private slots: }; -#endif \ No newline at end of file +#endif diff --git a/client/client.h b/client/client.h old mode 100644 new mode 100755 index 6306434..7be1ce2 --- a/client/client.h +++ b/client/client.h @@ -10,6 +10,9 @@ #include #include "Logger.h" +#include "ProxyClientApp.h" + +extern ProxyClientApp *this_app; #endif diff --git a/client/client.pro b/client/client.pro old mode 100644 new mode 100755 index c722957..2a05e1a --- a/client/client.pro +++ b/client/client.pro @@ -1,24 +1,36 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Wed Oct 19 03:05:59 2011 -###################################################################### - -QMAKE_CXXFLAGS=-O0 -QMAKE_CXXFLAGS_DEBUG += -DDEBUG -g3 -ggdb -O0 - -CONFIG -= release -CONFIG += debug console - -QT += network - -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . - -# Input -HEADERS += client.h Proxy.h Dialog.h ProxyClientApp.h Logger.h Config.h SslClient.h -SOURCES += Dialog.cpp main.cpp Proxy.cpp ProxyClientApp.cpp Logger.cpp Config.cpp SslClient.cpp - -OTHER_FILES += - -RESOURCES += client.qrc +###################################################################### +# Automatically generated by qmake (2.01a) Wed Oct 19 03:05:59 2011 +###################################################################### + +QMAKE_CXXFLAGS=-O0 +QMAKE_CXXFLAGS_DEBUG += -DDEBUG -g3 -ggdb -O0 + +CONFIG -= release +CONFIG += debug console + +QT += network + +TEMPLATE = app +TARGET = +DEPENDPATH += . +INCLUDEPATH += . + +# Input +HEADERS += client.h Proxy.h Dialog.h ProxyClientApp.h Logger.h Config.h SslClient.h \ + ../libs/qtsingleapplication/src/qtsingleapplication.h \ + ../libs/qtsingleapplication/src/qtlockedfile.h \ + ../libs/qtsingleapplication/src/qtlocalpeer.h \ + ../libs/qtsingleapplication/src/qtsinglecoreapplication.h +SOURCES += Dialog.cpp main.cpp Proxy.cpp ProxyClientApp.cpp Logger.cpp Config.cpp SslClient.cpp \ + ../libs/qtsingleapplication/src/qtsinglecoreapplication.cpp \ + ../libs/qtsingleapplication/src/qtsingleapplication.cpp \ + ../libs/qtsingleapplication/src/qtlockedfile_win.cpp \ + ../libs/qtsingleapplication/src/qtlockedfile_unix.cpp \ + ../libs/qtsingleapplication/src/qtlockedfile.cpp \ + ../libs/qtsingleapplication/src/qtlocalpeer.cpp + +OTHER_FILES += + +RESOURCES += client.qrc + + diff --git a/client/main.cpp b/client/main.cpp old mode 100644 new mode 100755 index b627b15..d5a8bcc --- a/client/main.cpp +++ b/client/main.cpp @@ -3,9 +3,11 @@ #include "client.h" #include "Dialog.h" +ProxyClientApp *this_app; + int main(int argc, char *argv[]) { Logger::Info("Starting client application\n"); - ProxyClientApp app(argc, argv); - return app.exec(); + this_app = new ProxyClientApp(argc, argv); + return this_app->exec(); } diff --git a/server/proxy_ui_server.workspace b/server/proxy_ui_server.workspace index b3c87b6..f3e41a2 100644 --- a/server/proxy_ui_server.workspace +++ b/server/proxy_ui_server.workspace @@ -11,6 +11,14 @@ -- cgit v1.2.3