From 43d99cc2477266cb9072e179137f0e8485370b3d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 7 Nov 2011 20:26:07 -0600 Subject: Rename kwin to twin (part 1 of 2) --- kicker/extensions/dockbar/dockbarextension.cpp | 12 ++++++------ kicker/extensions/dockbar/dockbarextension.h | 2 +- kicker/extensions/dockbar/dockcontainer.cpp | 2 +- kicker/extensions/kasbar/ChangeLog | 4 ++-- kicker/extensions/kasbar/kasbarapp.cpp | 2 +- kicker/extensions/kasbar/kasclockitem.cpp | 2 +- kicker/extensions/kasbar/kasgroupitem.cpp | 2 +- kicker/extensions/kasbar/kasloaditem.cpp | 2 +- kicker/extensions/kasbar/kasstartupitem.cpp | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) (limited to 'kicker/extensions') diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index aee6a728c..da20a2a61 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/kicker/extensions/dockbar/dockbarextension.cpp @@ -23,12 +23,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #undef Bool // For enable-final #include -#include +#include #include #include #include #include -#include +#include #include #include #include @@ -57,8 +57,8 @@ DockBarExtension::DockBarExtension(const TQString& configFile, Type type, : KPanelExtension(configFile, type, actions, parent, name) { dragging_container = 0; - kwin_module = new KWinModule(TQT_TQOBJECT(this)); - connect( kwin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) ); + twin_module = new KWinModule(TQT_TQOBJECT(this)); + connect( twin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) ); setMinimumSize(DockContainer::sz(), DockContainer::sz()); tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); loadContainerConfig(); @@ -154,8 +154,8 @@ void DockBarExtension::windowAdded(WId win) kdDebug() << "Could not read XClassHint of window " << win << endl; return; } - /* withdrawing the window prevents kwin from managing the window, - which causes the double-launch bug (one instance from the kwin + /* withdrawing the window prevents twin from managing the window, + which causes the double-launch bug (one instance from the twin session, and one from the dockbar) bug when kde is restarted */ if (resIconwin != win) { XWithdrawWindow( qt_xdisplay(), win, qt_xscreen() ); diff --git a/kicker/extensions/dockbar/dockbarextension.h b/kicker/extensions/dockbar/dockbarextension.h index eada2583b..4a5dff41f 100644 --- a/kicker/extensions/dockbar/dockbarextension.h +++ b/kicker/extensions/dockbar/dockbarextension.h @@ -61,7 +61,7 @@ protected: void mouseReleaseEvent(TQMouseEvent *); void mouseMoveEvent(TQMouseEvent *); private: - KWinModule* kwin_module; + KWinModule* twin_module; DockContainer::Vector containers; // handle the dragging of applets diff --git a/kicker/extensions/dockbar/dockcontainer.cpp b/kicker/extensions/dockbar/dockcontainer.cpp index 1d281619a..f6ac6bd33 100644 --- a/kicker/extensions/dockbar/dockcontainer.cpp +++ b/kicker/extensions/dockbar/dockcontainer.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include #include #include diff --git a/kicker/extensions/kasbar/ChangeLog b/kicker/extensions/kasbar/ChangeLog index 09408fc4a..67b22fd8a 100644 --- a/kicker/extensions/kasbar/ChangeLog +++ b/kicker/extensions/kasbar/ChangeLog @@ -384,7 +384,7 @@ 2004-06-26 Saturday 00:28 rich - * - Fix test program for kwin changes. + * - Fix test program for twin changes. 2004-06-26 Saturday 00:10 rich @@ -698,7 +698,7 @@ 2001-11-29 Thursday 19:23 rich - * Switch to taskmanager task popup menu instead of kwin (avoids + * Switch to taskmanager task popup menu instead of twin (avoids some problems) 2001-11-25 Sunday 02:03 rich diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp index 17cbfb967..8ceceaf37 100644 --- a/kicker/extensions/kasbar/kasbarapp.cpp +++ b/kicker/extensions/kasbar/kasbarapp.cpp @@ -56,7 +56,7 @@ #include #include #include -#include +#include #include #include diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp index 518245d4b..959734c22 100644 --- a/kicker/extensions/kasbar/kasclockitem.cpp +++ b/kicker/extensions/kasbar/kasclockitem.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp index fe5f02ef6..31615acbf 100644 --- a/kicker/extensions/kasbar/kasgroupitem.cpp +++ b/kicker/extensions/kasbar/kasgroupitem.cpp @@ -58,7 +58,7 @@ #include #include -#include +#include #include #include #include diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp index e36d2d18d..459bd6639 100644 --- a/kicker/extensions/kasbar/kasloaditem.cpp +++ b/kicker/extensions/kasbar/kasloaditem.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include #include diff --git a/kicker/extensions/kasbar/kasstartupitem.cpp b/kicker/extensions/kasbar/kasstartupitem.cpp index 4d2ac3b00..41adc5249 100644 --- a/kicker/extensions/kasbar/kasstartupitem.cpp +++ b/kicker/extensions/kasbar/kasstartupitem.cpp @@ -58,7 +58,7 @@ #include #include -#include +#include #include #include #include -- cgit v1.2.3