From 159963832457e6307282308455330acc7b5bd153 Mon Sep 17 00:00:00 2001 From: David Faure Date: Wed, 18 Dec 2013 09:53:59 +0100 Subject: Code reformatted using kde-dev-scripts/astyle-kdelibs. Use git blame -w 867e7a5 to show authorship as it was before this commit. --- src/gui/kwindowconfig.cpp | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'src/gui/kwindowconfig.cpp') diff --git a/src/gui/kwindowconfig.cpp b/src/gui/kwindowconfig.cpp index 6b7ae5f0..c3cefb74 100644 --- a/src/gui/kwindowconfig.cpp +++ b/src/gui/kwindowconfig.cpp @@ -24,13 +24,14 @@ #include #include -static const char* s_initialSizePropertyName = "_kconfig_initial_size"; -static const char* s_initialScreenSizePropertyName = "_kconfig_initial_screen_size"; +static const char *s_initialSizePropertyName = "_kconfig_initial_size"; +static const char *s_initialScreenSizePropertyName = "_kconfig_initial_screen_size"; void KWindowConfig::saveWindowSize(const QWindow *window, KConfigGroup &config, KConfigGroup::WriteConfigFlags options) { - if (!window) + if (!window) { return; + } const QRect desk = window->screen()->geometry(); const QSize sizeToSave = window->size(); @@ -41,25 +42,27 @@ void KWindowConfig::saveWindowSize(const QWindow *window, KConfigGroup &config, if (!isMaximized) { const QSize defaultSize(window->property(s_initialSizePropertyName).toSize()); const QSize defaultScreenSize(window->property(s_initialScreenSizePropertyName).toSize()); - const bool sizeValid = defaultSize.isValid() && defaultScreenSize.isValid(); - if (!sizeValid || (sizeValid && (defaultSize != sizeToSave || defaultScreenSize != desk.size()))) { - const QString wString(QString::fromLatin1("Width %1").arg(desk.width())); - const QString hString(QString::fromLatin1("Height %1").arg(desk.height())); - config.writeEntry(wString, sizeToSave.width(), options); - config.writeEntry(hString, sizeToSave.height(), options); + const bool sizeValid = defaultSize.isValid() && defaultScreenSize.isValid(); + if (!sizeValid || (sizeValid && (defaultSize != sizeToSave || defaultScreenSize != desk.size()))) { + const QString wString(QString::fromLatin1("Width %1").arg(desk.width())); + const QString hString(QString::fromLatin1("Height %1").arg(desk.height())); + config.writeEntry(wString, sizeToSave.width(), options); + config.writeEntry(hString, sizeToSave.height(), options); } } - if ( (isMaximized == false) && !config.hasDefault(screenMaximizedString) ) + if ((isMaximized == false) && !config.hasDefault(screenMaximizedString)) { config.revertToDefault(screenMaximizedString); - else + } else { config.writeEntry(screenMaximizedString, isMaximized, options); + } } -void KWindowConfig::restoreWindowSize(QWindow* window, const KConfigGroup& config) +void KWindowConfig::restoreWindowSize(QWindow *window, const KConfigGroup &config) { - if (!window) + if (!window) { return; + } const QRect desk = window->screen()->geometry(); -- cgit v1.2.1