FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanups.

Browse Source
This commit is contained in:
Martin Rotter 2014-03-11 10:50:41 +01:00
parent fbcd580210
commit 4bce1db1b9
4 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/formmain.cpp
View File

@ -248,7 +248,6 @@ void FormMain::onAboutToQuit() {
// We locked the lock to exit peacefully, unlock it to avoid warnings. // We locked the lock to exit peacefully, unlock it to avoid warnings.
SystemFactory::instance()->applicationCloseLock()->unlock(); SystemFactory::instance()->applicationCloseLock()->unlock();
QtSingleApplication::instance()->unlock();
} }
else { else {
// Request for write lock timed-out. This means // 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_actionOpenSelectedSourceArticlesExternally->setIcon(icon_theme_factory->fromTheme("item-open"));
m_ui->m_actionOpenSelectedMessagesInternally->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_actionViewSelectedItemsNewspaperMode->setIcon(icon_theme_factory->fromTheme("item-newspaper"));
m_ui->m_actionSelectNextFeedCategory->setIcon(icon_theme_factory->fromTheme("go-down")); 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_actionSelectPreviousFeedCategory->setIcon(icon_theme_factory->fromTheme("go-up"));
m_ui->m_actionSelectNextMessage->setIcon(icon_theme_factory->fromTheme("go-down")); m_ui->m_actionSelectNextMessage->setIcon(icon_theme_factory->fromTheme("go-down"));

7
src/qtsingleapplication/qtlocalpeer.h
View File

@ -60,13 +60,6 @@ public:
return id; return id;
} }
// Unlocks the file.
bool unlock() {
bool unlocked = lockFile.unlock();
lockFile.remove();
return unlocked;
}
Q_SIGNALS: Q_SIGNALS:
void messageReceived(const QString &message); void messageReceived(const QString &message);

4
src/qtsingleapplication/qtsingleapplication.cpp
View File

@ -95,10 +95,6 @@ QString QtSingleApplication::id() const {
return peer->applicationId(); return peer->applicationId();
} }
bool QtSingleApplication::unlock() {
return peer->unlock();
}
void QtSingleApplication::setActivationWindow(QWidget* aw, bool activateOnMessage) { void QtSingleApplication::setActivationWindow(QWidget* aw, bool activateOnMessage) {
actWin = aw; actWin = aw;
if (activateOnMessage) if (activateOnMessage)

5
src/qtsingleapplication/qtsingleapplication.h
View File

@ -79,11 +79,6 @@ class QT_QTSINGLEAPPLICATION_EXPORT QtSingleApplication : public QApplication {
bool isRunning(); bool isRunning();
QString id() const; 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); void setActivationWindow(QWidget* aw, bool activateOnMessage = true);
QWidget* activationWindow() const; QWidget* activationWindow() const;