Browse Source

gitignore; linux specific

master
Robin Thoni 10 years ago
parent
commit
e9301f3ee8

+ 1
- 1
.gitignore View File

9
 *.so*
9
 *.so*
10
 *.autosave
10
 *.autosave
11
 netsoul/netsoul
11
 netsoul/netsoul
12
-ns_finder/ns_finder
12
+ns_finder/loginfinder
13
 usermgr/usermgr
13
 usermgr/usermgr
14
 intrabocal/intrabocal
14
 intrabocal/intrabocal

+ 6
- 1
Epimafia/epimafia.cpp View File

1
 #include "epimafia.h"
1
 #include "epimafia.h"
2
+#include <QDir>
2
 
3
 
3
 #ifdef Q_OS_WIN
4
 #ifdef Q_OS_WIN
4
 QSettings Epimafia::m_settings("epimafia.ini", QSettings::IniFormat);
5
 QSettings Epimafia::m_settings("epimafia.ini", QSettings::IniFormat);
5
 #else
6
 #else
6
-#error "OS specific"
7
+	#ifdef Q_OS_LINUX
8
+	QSettings Epimafia::m_settings(QDir::homePath() + "/.epimafia.ini", QSettings::IniFormat);
9
+	#else
10
+	#error "OS specific"
11
+	#endif
7
 #endif
12
 #endif
8
 
13
 
9
 unsigned char Epimafia::m_aesKey[] =
14
 unsigned char Epimafia::m_aesKey[] =

+ 6
- 2
intrabocal/widget.cpp View File

103
     connect(p, SIGNAL(finished(int)), this, SLOT(processFinished(int)));
103
     connect(p, SIGNAL(finished(int)), this, SLOT(processFinished(int)));
104
 	QString exe;
104
 	QString exe;
105
 #ifdef Q_OS_WIN
105
 #ifdef Q_OS_WIN
106
-	exe = "usermgr.exe";
106
+exe = "usermgr.exe";
107
 #else
107
 #else
108
-#error "OS specific"
108
+	#ifdef Q_OS_LINUX
109
+	exe = "usermgr";
110
+	#else
111
+	#error "OS specific"
112
+	#endif
109
 #endif
113
 #endif
110
 	p->start(exe);
114
 	p->start(exe);
111
 }
115
 }

+ 5
- 1
netsoul/connectwidget.cpp View File

70
 #ifdef Q_OS_WIN
70
 #ifdef Q_OS_WIN
71
 	exe = "usermgr.exe";
71
 	exe = "usermgr.exe";
72
 #else
72
 #else
73
-#error "OS specific"
73
+	#ifdef Q_OS_LINUX
74
+	exe = "usermgr";
75
+	#else
76
+	#error "OS specific"
77
+	#endif
74
 #endif
78
 #endif
75
 	p->start(exe);
79
 	p->start(exe);
76
 }
80
 }

+ 6
- 2
netsoul/contactswidget.cpp View File

83
 {
83
 {
84
 	QString exe;
84
 	QString exe;
85
 #ifdef Q_OS_WIN
85
 #ifdef Q_OS_WIN
86
-	exe = "intrabocal.exe";
86
+exe = "intrabocal.exe";
87
 #else
87
 #else
88
-#error "OS specific"
88
+	#ifdef Q_OS_LINUX
89
+	exe = "intrabocal";
90
+	#else
91
+	#error "OS specific"
92
+	#endif
89
 #endif
93
 #endif
90
     foreach(NetSoul::User usr, ui->listContacts->getSelectedUsers())
94
     foreach(NetSoul::User usr, ui->listContacts->getSelectedUsers())
91
 		QProcess::startDetached(exe, QStringList() << "-login" << usr.login);
95
 		QProcess::startDetached(exe, QStringList() << "-login" << usr.login);

+ 15
- 3
netsoul/options.cpp View File

1
 #include "options.h"
1
 #include "options.h"
2
+#include <QDir>
2
 
3
 
3
 Options* Options::m_options = 0;
4
 Options* Options::m_options = 0;
4
 
5
 
18
 	QSettings set("HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows\\CurrentVersion\\Run", QSettings::NativeFormat);
19
 	QSettings set("HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows\\CurrentVersion\\Run", QSettings::NativeFormat);
19
 	return set.childKeys().contains("Epimafia Netsoul");
20
 	return set.childKeys().contains("Epimafia Netsoul");
20
 #else
21
 #else
21
-#error "OS sepcific"
22
+	#ifdef Q_OS_LINUX
23
+	return false;
24
+	#else
25
+	#error "OS sepcific"
26
+	#endif
22
 #endif
27
 #endif
23
 }
28
 }
24
 
29
 
59
 	else
64
 	else
60
 		set.remove("Epimafia Netsoul");
65
 		set.remove("Epimafia Netsoul");
61
 #else
66
 #else
62
-#error "OS specific"
67
+	#ifdef Q_OS_LINUX
68
+	#else
69
+	#error "OS specific"
70
+	#endif
63
 #endif
71
 #endif
64
 }
72
 }
65
 
73
 
87
 	#ifdef Q_OS_WIN
95
 	#ifdef Q_OS_WIN
88
 	m_settings("epimafianetsoul.ini", QSettings::IniFormat)
96
 	m_settings("epimafianetsoul.ini", QSettings::IniFormat)
89
 	#else
97
 	#else
90
-	#error "OS specific"
98
+		#ifdef Q_OS_LINUX
99
+		m_settings(QDir::homePath() + "/.epimafianetsoul.ini", QSettings::IniFormat)
100
+		#else
101
+		#error "OS specific"
102
+		#endif
91
 	#endif
103
 	#endif
92
 {
104
 {
93
 }
105
 }

+ 5
- 1
ns_finder/widget.cpp View File

124
 #ifdef Q_OS_WIN
124
 #ifdef Q_OS_WIN
125
 	exe = "intrabocal.exe";
125
 	exe = "intrabocal.exe";
126
 #else
126
 #else
127
-#error "OS specific"
127
+	#ifdef Q_OS_LINUX
128
+	exe = "intrabocal";
129
+	#else
130
+	#error "OS specific"
131
+	#endif
128
 #endif
132
 #endif
129
 	QProcess::startDetached(exe, QStringList() << "-logins" << logins);
133
 	QProcess::startDetached(exe, QStringList() << "-logins" << logins);
130
 }
134
 }

Loading…
Cancel
Save