diff options
Diffstat (limited to 'twin')
| -rw-r--r-- | twin/data/update_default_rules.cpp | 2 | ||||
| -rw-r--r-- | twin/data/update_window_settings.cpp | 2 | ||||
| -rw-r--r-- | twin/geometry.cpp | 4 | ||||
| -rw-r--r-- | twin/kcmtwin/twindecoration/twindecoration.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/twin/data/update_default_rules.cpp b/twin/data/update_default_rules.cpp index f771229fc..c37abc81d 100644 --- a/twin/data/update_default_rules.cpp +++ b/twin/data/update_default_rules.cpp @@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms. #include <dcopclient.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdestandarddirs.h> int main( int argc, char* argv[] ) diff --git a/twin/data/update_window_settings.cpp b/twin/data/update_window_settings.cpp index 422bb30c5..d4b525691 100644 --- a/twin/data/update_window_settings.cpp +++ b/twin/data/update_window_settings.cpp @@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms. #include <netwm_def.h> #include <tdeconfig.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <dcopclient.h> struct SessionInfo diff --git a/twin/geometry.cpp b/twin/geometry.cpp index 6adad44fe..3e09d03ef 100644 --- a/twin/geometry.cpp +++ b/twin/geometry.cpp @@ -1915,12 +1915,12 @@ void Client::changeMaximize( bool vertical, bool horizontal, bool adjust ) TQRect clientArea = workspace()->clientArea( MaximizeArea, this ); // save sizes for restoring, if maximalizing - if( !activeTiled && !adjust && !( y() == clientArea.top() && height() == clientArea.height())) + if( !adjust && !( y() == clientArea.top() && height() == clientArea.height())) { geom_restore.setTop( y()); geom_restore.setHeight( height()); } - if( !activeTiled && !adjust && !( x() == clientArea.left() && width() == clientArea.width())) + if( !adjust && !( x() == clientArea.left() && width() == clientArea.width())) { geom_restore.setLeft( x()); geom_restore.setWidth( width()); diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp index 408bd563c..360417123 100644 --- a/twin/kcmtwin/twindecoration/twindecoration.cpp +++ b/twin/kcmtwin/twindecoration/twindecoration.cpp @@ -455,7 +455,7 @@ void KWinDecorationModule::createThirdPartyWMList() TQString wmExecutable; TQStringList wmNames; TQStringList wmAvailableNames; - wmNames << TQString("kwin ").append(i18n("(KDE4's window manager)")) << TQString("compiz ").append(i18n("(Compiz Effects Manager)")) << TQString("icewm ").append(i18n("(Simple, fast window manager)")); + wmNames << TQString("kwin ").append(i18n("(KDE's window manager)")) << TQString("compiz ").append(i18n("(Compiz Effects Manager)")) << TQString("icewm ").append(i18n("(Simple, fast window manager)")); wmNames.sort(); wmNames.prepend(TQString("twin ").append(i18n("(Default TDE window manager)"))); for (it = wmNames.begin(); it != wmNames.end(); ++it) |