TDE
/
tdeutils
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdeutils
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename kwin to twin (part 1 of 2)

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent f5d672d1dd
commit 2caaeba93d
20 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File

4
kdelirc/irkick/irkick.cpp
Unescape View File

@ -30,8 +30,8 @@
#include <klocale.h>
#include <kaboutdialog.h>
#include <kaboutkde.h>
#include <kwinmodule.h>
#include <kwin.h>
#include <twinmodule.h>
#include <twin.h>
#include <khelpmenu.h>
#include <kglobal.h>
#include <kstdguiitem.h>

2
kdelirc/irkick/main.cpp
Unescape View File

@ -9,7 +9,7 @@
#include <klocale.h>
#include <kcmdlineargs.h>
#include <kwin.h>
#include <twin.h>
#include <kaboutdata.h>
#include <kglobal.h>
#include <kdebug.h>

2
kgpg/kgpg.cpp
Unescape View File

@ -46,7 +46,7 @@
#include <tqbuttongroup.h>
#include <kiconloader.h>
#include <ktempfile.h>
#include <kwin.h>
#include <twin.h>
#include <kprocess.h>
#include <kprocio.h>
#include <kaboutapplication.h>

2
kgpg/listkeys.cpp
Unescape View File

@ -59,7 +59,7 @@
#include <krun.h>
#include <kprinter.h>
#include <kurldrag.h>
#include <kwin.h>
#include <twin.h>
#include <dcopclient.h>
#include <klineedit.h>
#include <kiconloader.h>

2
khexedit/toplevel.cc
Unescape View File

@ -1342,7 +1342,7 @@ int KHexEdit::acceleratorNumKey( uint index )
#include <unistd.h>
//
// This function is used to test kwin performance
// This function is used to test twin performance
//
void KHexEdit::resizeTest()
{

2
kmilo/kmilod/defaultskin.cpp
Unescape View File

@ -29,7 +29,7 @@
#include <tqlabel.h>
#include <tqapplication.h>
#include <kwin.h>
#include <twin.h>
#include <netwm.h>
#include <kglobalsettings.h>
#include <kdeversion.h>

2
kregexpeditor/auxbuttons.h
Unescape View File

@ -18,7 +18,7 @@
#ifndef AUXBUTTONS_H
#define AUXBUTTONS_H
#include <tqdockwindow.h>
#include <tqdoctwindow.h>
class TQComboBox;
class TQLabel;
class TQToolButton;

2
kregexpeditor/regexpbuttons.h
Unescape View File

@ -18,7 +18,7 @@
#ifndef __REGEXPBUTTONS_H
#define __REGEXPBUTTONS_H
#include <tqdockwindow.h>
#include <tqdoctwindow.h>
#include "widgetfactory.h"
class DoubleClickButton;
class TQButtonGroup;

2
kregexpeditor/userdefinedregexps.h
Unescape View File

@ -17,7 +17,7 @@
**/
#ifndef __USERDEFINEDREGEXPS_H
#define __USERDEFINEDREGEXPS_H
#include <tqdockwindow.h>
#include <tqdoctwindow.h>
#include <tqlistview.h>
#include "compoundregexp.h"

2
kregexpeditor/verifybuttons.h
Unescape View File

@ -18,7 +18,7 @@
#ifndef VERIFYBUTTONS_H
#define VERIFYBUTTONS_H
#include <tqdockwindow.h>
#include <tqdoctwindow.h>
#include "regexpconverter.h"
class TQToolButton;
class TQLabel;

2
ksim/ChangeLog
Unescape View File

@ -331,7 +331,7 @@ KSim 0.3:
* Reset the net-plugin information to zero when a net interface goes off line
* Insert the available net interfaces into the add net interface dialog
* Fixed the bug where some themes (one without masked image borders)
would influence if KSim had a kwin deco or not
would influence if KSim had a twin deco or not
* Re-worked the KSim::Base class, a derived class of KSim::Base no
longer has to inherit a QObject derived class and doesn't have to
reimplement 'void setName(const char *name)'

2
ksim/ksimview.cpp
Unescape View File

@ -43,7 +43,7 @@
#include <kstandarddirs.h>
#include <kmessagebox.h>
#include <kdesktopfile.h>
#include <kwin.h>
#include <twin.h>
#include <krun.h>
#include <tqfile.h>

2
kwallet/kwmapeditor.cpp
Unescape View File

@ -24,7 +24,7 @@
#include <klocale.h>
#include <kpopupmenu.h>
#include <kstdaction.h>
#include <kwin.h>
#include <twin.h>
#include <tqapplication.h>
#include <tqclipboard.h>

2
superkaramba/src/karamba.cpp
Unescape View File

@ -35,7 +35,7 @@
#include <kmessagebox.h>
#include <krun.h>
#include <klocale.h>
#include <kwin.h>
#include <twin.h>
#include <kdeversion.h>
#include <kdirwatch.h>

4
superkaramba/src/karamba.h
Unescape View File

@ -31,8 +31,8 @@
#include <tqwidget.h>
#include <kapplication.h>
#include <kwinmodule.h>
#include <kwin.h>
#include <twinmodule.h>
#include <twin.h>
#include <tqfile.h>
#include <kfile.h>

6
superkaramba/src/showdesktop.cpp
Unescape View File

@ -18,9 +18,9 @@
* along with SuperKaramba; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
****************************************************************************/
#include <kwinmodule.h>
#include <twinmodule.h>
#include <netwm.h>
#include <kwin.h>
#include <twin.h>
#include "karambaapp.h"
#include "showdesktop.h"
@ -62,7 +62,7 @@ void ShowDesktop::slotWindowChanged(WId w, unsigned int dirty)
if (!showingDesktop)
return;
// SELI this needs checking for kwin_iii (_NET_SHOWING_DESKTOP)
// SELI this needs checking for twin_iii (_NET_SHOWING_DESKTOP)
if ( dirty & NET::XAWMState )
{
NETWinInfo inf(qt_xdisplay(), w, qt_xrootwin(),

16
superkaramba/src/systemtray.cpp
Unescape View File

@ -22,10 +22,10 @@
#include <tqobject.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kwinmodule.h>
#include <twinmodule.h>
#include <kmessagebox.h>
#include <kdebug.h>
#include <kwin.h>
#include <twin.h>
#include <tqpopupmenu.h>
#include <tqdragobject.h>
@ -51,7 +51,7 @@ Systemtray::~Systemtray()
int Systemtray::getTraySize() {
return (int) kwin_module->systemTrayWindows().size();
return (int) twin_module->systemTrayWindows().size();
}
void Systemtray::updateBackgroundPixmap ( const TQPixmap & pixmap) {
@ -82,8 +82,8 @@ void Systemtray::initSystray( void )
Display *display = qt_xdisplay();
no_of_systray_windows = 0;
kwin_module = new KWinModule();
systemTrayWindows = kwin_module->systemTrayWindows();
twin_module = new KWinModule();
systemTrayWindows = twin_module->systemTrayWindows();
TQValueList<WId>::ConstIterator end(systemTrayWindows.end());
for (TQValueList<WId>::ConstIterator it = systemTrayWindows.begin(); it!=end; ++it)
{
@ -107,8 +107,8 @@ void Systemtray::initSystray( void )
updateTrayWindows();
connect(kwin_module, TQT_SIGNAL(systemTrayWindowAdded(WId)), TQT_SLOT(systemTrayWindowAdded(WId)));
connect(kwin_module, TQT_SIGNAL(systemTrayWindowRemoved(WId)), TQT_SLOT(systemTrayWindowRemoved(WId)));
connect(twin_module, TQT_SIGNAL(systemTrayWindowAdded(WId)), TQT_SLOT(systemTrayWindowAdded(WId)));
connect(twin_module, TQT_SIGNAL(systemTrayWindowRemoved(WId)), TQT_SLOT(systemTrayWindowRemoved(WId)));
TQCString screenstr;
screenstr.setNum(qt_xscreen());
@ -153,7 +153,7 @@ void Systemtray::updateTrayWindows( void )
while ((emb = m_Wins.current()) != 0L)
{
WId wid = emb->embeddedWinId();
if ((wid == 0) || !kwin_module->systemTrayWindows().contains(wid) )
if ((wid == 0) || !twin_module->systemTrayWindows().contains(wid) )
m_Wins.remove(emb);
else
m_Wins.next();

2
superkaramba/src/systemtray.h
Unescape View File

@ -56,7 +56,7 @@ signals:
void updated();
private:
KWinModule *kwin_module;
KWinModule *twin_module;
TQValueList<WId> systemTrayWindows;
TQPtrList<QXEmbed> m_Wins;

42
superkaramba/src/taskmanager.cpp
Unescape View File

@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kdebug.h>
#include <kconfig.h>
#include <kiconloader.h>
#include <kwinmodule.h>
#include <twinmodule.h>
#include <netwm.h>
#include <tqtimer.h>
#include <tqimage.h>
@ -46,29 +46,29 @@ template class TQPtrList<Task>;
// variable without changing Task, which also uses it.
// So, we'll leak a little memory, but it's better than crashing.
// The real problem is that KWinModule should be a singleton.
KWinModule* kwin_module = 0;
KWinModule* twin_module = 0;
TaskManager::TaskManager(TQObject *parent, const char *name)
: TQObject(parent, name), _active(0), _startup_info( NULL )
{
kwin_module = new KWinModule();
twin_module = new KWinModule();
// KGlobal::locale()->insertCatalogue("libtaskmanager");
connect(kwin_module, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId)));
connect(kwin_module, TQT_SIGNAL(windowRemoved(WId)), TQT_SLOT(windowRemoved(WId)));
connect(kwin_module, TQT_SIGNAL(activeWindowChanged(WId)), TQT_SLOT(activeWindowChanged(WId)));
connect(kwin_module, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(currentDesktopChanged(int)));
connect(kwin_module, TQT_SIGNAL(windowChanged(WId,unsigned int)), TQT_SLOT(windowChanged(WId,unsigned int)));
connect(twin_module, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId)));
connect(twin_module, TQT_SIGNAL(windowRemoved(WId)), TQT_SLOT(windowRemoved(WId)));
connect(twin_module, TQT_SIGNAL(activeWindowChanged(WId)), TQT_SLOT(activeWindowChanged(WId)));
connect(twin_module, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(currentDesktopChanged(int)));
connect(twin_module, TQT_SIGNAL(windowChanged(WId,unsigned int)), TQT_SLOT(windowChanged(WId,unsigned int)));
// register existing windows
const TQValueList<WId> windows = kwin_module->windows();
const TQValueList<WId> windows = twin_module->windows();
TQValueList<WId>::ConstIterator end( windows.end() );
for (TQValueList<WId>::ConstIterator it = windows.begin(); it != end; ++it )
windowAdded(*it);
// set active window
WId win = kwin_module->activeWindow();
WId win = twin_module->activeWindow();
activeWindowChanged(win);
configure_startup();
@ -300,20 +300,20 @@ void TaskManager::killStartup(Startup* s)
TQString TaskManager::desktopName(int desk) const
{
return kwin_module->desktopName(desk);
return twin_module->desktopName(desk);
}
int TaskManager::numberOfDesktops() const
{
return kwin_module->numberOfDesktops();
return twin_module->numberOfDesktops();
}
bool TaskManager::isOnTop(const Task* task)
{
if(!task) return false;
for (TQValueList<WId>::ConstIterator it = kwin_module->stackingOrder().fromLast();
it != kwin_module->stackingOrder().end(); --it ) {
for (TQValueList<WId>::ConstIterator it = twin_module->stackingOrder().fromLast();
it != twin_module->stackingOrder().end(); --it ) {
for (Task* t = _tasks.first(); t != 0; t = _tasks.next() ) {
if ( (*it) == t->window() ) {
if ( t == task )
@ -435,9 +435,9 @@ bool Task::isShaded() const
bool Task::isOnCurrentDesktop() const
{
#ifdef KDE_3_2
return (_info.onAllDesktops() || _info.desktop() == kwin_module->currentDesktop());
return (_info.onAllDesktops() || _info.desktop() == twin_module->currentDesktop());
#else
return (_info.onAllDesktops || _info.desktop == kwin_module->currentDesktop());
return (_info.onAllDesktops || _info.desktop == twin_module->currentDesktop());
#endif
}
@ -692,13 +692,13 @@ void Task::toDesktop(int desk)
#ifdef KDE_3_2
if (_info.onAllDesktops())
{
ni.setDesktop(kwin_module->currentDesktop());
ni.setDesktop(twin_module->currentDesktop());
KWin::forceActiveWindow(_win);
}
#else
if (_info.onAllDesktops)
{
ni.setDesktop(kwin_module->currentDesktop());
ni.setDesktop(twin_module->currentDesktop());
KWin::setActiveWindow(_win);
}
#endif
@ -707,7 +707,7 @@ void Task::toDesktop(int desk)
return;
}
ni.setDesktop(desk);
if (desk == kwin_module->currentDesktop())
if (desk == twin_module->currentDesktop())
#ifdef KDE_3_2
KWin::forceActiveWindow(_win);
#else
@ -717,7 +717,7 @@ void Task::toDesktop(int desk)
void Task::toCurrentDesktop()
{
toDesktop(kwin_module->currentDesktop());
toDesktop(twin_module->currentDesktop());
}
void Task::setAlwaysOnTop(bool stay)
@ -821,5 +821,5 @@ void Startup::update( const KStartupInfoData& data )
int TaskManager::currentDesktop() const
{
return kwin_module->currentDesktop();
return twin_module->currentDesktop();
}

2
superkaramba/src/taskmanager.h
Unescape View File

@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqpixmap.h>
#include <dcopobject.h>
#include <kwin.h>
#include <twin.h>
#include <kstartupinfo.h>
#include "karambaapp.h"

Write Preview
Loading…
Cancel
Save