Fix conflicting Config.cpp

5 files changed, 47 insertions, 29 deletions

diff --git a/client/Config.cpp b/client/Config.cpp
index 8ba72d0..f7b30cd 100644..100755
--- 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");
@@ -330,4 +330,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
index c3c56af..a40177a 100644..100755
--- a/client/ProxyClientApp.h
+++ b/client/ProxyClientApp.h
@@ -6,6 +6,7 @@
 #include <QSystemTrayIcon>
 #include <QApplication>
 
+//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
index 6306434..7be1ce2 100644..100755
--- a/client/client.h
+++ b/client/client.h
@@ -10,6 +10,9 @@
 #include <vector>
 
 #include "Logger.h"
+#include "ProxyClientApp.h"
+
+extern ProxyClientApp *this_app;
 
 
 #endif
diff --git a/client/client.pro b/client/client.pro
index c722957..2a05e1a 100644..100755
--- 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
index b627b15..d5a8bcc 100644..100755
--- 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();
 }