diff options
| -rw-r--r-- | singleapplication.cpp | 13 | ||||
| -rw-r--r-- | singleapplication.h | 4 |
2 files changed, 5 insertions, 12 deletions
diff --git a/singleapplication.cpp b/singleapplication.cpp index 083ea30..7ae333d 100644 --- a/singleapplication.cpp +++ b/singleapplication.cpp @@ -2,8 +2,7 @@ #include <cstdlib> /** - * @brief Constructor. Checks and fires up LocalServer or closes the -program + * @brief Constructor. Checks and fires up LocalServer or closes the program * if another instance already exists * @param argc * @param argv @@ -11,8 +10,7 @@ program SingleApplication::SingleApplication(int argc, char *argv[]) : QApplication(argc, argv) { - QString serverName = QApplication::organizationName() + -QApplication::applicationName(); + QString serverName = QApplication::organizationName() + QApplication::applicationName(); serverName.replace(QRegExp("[^\\w\\-. ]"), ""); // Attempt to connect to the LocalServer @@ -20,16 +18,14 @@ QApplication::applicationName(); socket->connectToServer(serverName); if(socket->waitForConnected(1000)){ socket->close(); - ::exit(EXIT_SUCCESS); // Terminate the program using STDLib's -exit function + ::exit(EXIT_SUCCESS); // Terminate the program using STDLib's exit function } else { // If the connection is insuccessful, this is the main process // So we create a Local Server server = new QLocalServer(); server->removeServer(serverName); server->listen(serverName); - QObject::connect(server, SIGNAL(newConnection()), this, -SLOT(slotConnectionEstablished())); + QObject::connect(server, SIGNAL(newConnection()), this, SLOT(slotConnectionEstablished())); } } @@ -49,4 +45,3 @@ void SingleApplication::slotConnectionEstablished() server->nextPendingConnection(); emit showUp(); } - diff --git a/singleapplication.h b/singleapplication.h index 2fabfbd..7fab2a7 100644 --- a/singleapplication.h +++ b/singleapplication.h @@ -6,8 +6,7 @@ #include <QLocalServer> /** - * @brief The SingleApplication class handles multipe instances of the -same Application + * @brief The SingleApplication class handles multipe instances of the same Application * @see QApplication */ class SingleApplication : public QApplication @@ -30,4 +29,3 @@ private: }; #endif // SINGLE_APPLICATION_H - |