Cleanups.
This commit is contained in:
parent
fbcd580210
commit
4bce1db1b9
@ -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"));
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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)
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user