diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp index a6c03eb8b..8fb429f8d 100755 --- a/src/gui/formmain.cpp +++ b/src/gui/formmain.cpp @@ -248,7 +248,6 @@ void FormMain::onAboutToQuit() { // We locked the lock to exit peacefully, unlock it to avoid warnings. SystemFactory::instance()->applicationCloseLock()->unlock(); - QtSingleApplication::instance()->unlock(); } else { // Request for write lock timed-out. This means @@ -303,7 +302,6 @@ void FormMain::setupIcons() { m_ui->m_actionOpenSelectedSourceArticlesExternally->setIcon(icon_theme_factory->fromTheme("item-open")); m_ui->m_actionOpenSelectedMessagesInternally->setIcon(icon_theme_factory->fromTheme("item-open")); m_ui->m_actionViewSelectedItemsNewspaperMode->setIcon(icon_theme_factory->fromTheme("item-newspaper")); - m_ui->m_actionSelectNextFeedCategory->setIcon(icon_theme_factory->fromTheme("go-down")); m_ui->m_actionSelectPreviousFeedCategory->setIcon(icon_theme_factory->fromTheme("go-up")); m_ui->m_actionSelectNextMessage->setIcon(icon_theme_factory->fromTheme("go-down")); diff --git a/src/qtsingleapplication/qtlocalpeer.h b/src/qtsingleapplication/qtlocalpeer.h index 46faef856..f908b79b3 100644 --- a/src/qtsingleapplication/qtlocalpeer.h +++ b/src/qtsingleapplication/qtlocalpeer.h @@ -60,13 +60,6 @@ public: return id; } - // Unlocks the file. - bool unlock() { - bool unlocked = lockFile.unlock(); - lockFile.remove(); - return unlocked; - } - Q_SIGNALS: void messageReceived(const QString &message); diff --git a/src/qtsingleapplication/qtsingleapplication.cpp b/src/qtsingleapplication/qtsingleapplication.cpp index ae7baca73..e22eae5c8 100644 --- a/src/qtsingleapplication/qtsingleapplication.cpp +++ b/src/qtsingleapplication/qtsingleapplication.cpp @@ -95,10 +95,6 @@ QString QtSingleApplication::id() const { return peer->applicationId(); } -bool QtSingleApplication::unlock() { - return peer->unlock(); -} - void QtSingleApplication::setActivationWindow(QWidget* aw, bool activateOnMessage) { actWin = aw; if (activateOnMessage) diff --git a/src/qtsingleapplication/qtsingleapplication.h b/src/qtsingleapplication/qtsingleapplication.h index fd3e3b2a9..450498f25 100644 --- a/src/qtsingleapplication/qtsingleapplication.h +++ b/src/qtsingleapplication/qtsingleapplication.h @@ -79,11 +79,6 @@ class QT_QTSINGLEAPPLICATION_EXPORT QtSingleApplication : public QApplication { bool isRunning(); QString id() const; - // Unlocks locked file, thus allows second instance to start - // when application is restarted programatically. - // Returns true if unlocked. - bool unlock(); - void setActivationWindow(QWidget* aw, bool activateOnMessage = true); QWidget* activationWindow() const;