From 04fcdc080321c9531c5b61e6f216d3967f2d39ef Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 7 Nov 2011 20:21:54 -0600 Subject: Rename kwin to twin (part 1 of 2) --- src/kernel/qaccel.cpp | 2 +- src/kernel/qapplication_x11.cpp | 8 ++++---- src/kernel/qt.h | 2 +- src/styles/qmotifstyle.cpp | 2 +- src/styles/qwindowsstyle.cpp | 2 +- src/tools/qwinexport.cpp | 2 +- src/widgets/qdockarea.h | 2 +- src/widgets/qdockwindow.cpp | 8 ++++---- src/widgets/qmainwindow.cpp | 2 +- src/widgets/qt_widgets.pri | 4 ++-- src/widgets/qtitlebar_p.h | 2 +- src/widgets/qtoolbar.cpp | 2 +- src/widgets/qtoolbar.h | 2 +- src/widgets/qtoolbutton.cpp | 2 +- src/workspace/qworkspace.cpp | 16 ++++++++-------- 15 files changed, 29 insertions(+), 29 deletions(-) (limited to 'src') diff --git a/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp index 53814dc..cf64c82 100644 --- a/src/kernel/qaccel.cpp +++ b/src/kernel/qaccel.cpp @@ -49,7 +49,7 @@ #include "qwhatsthis.h" #include "qguardedptr.h" #include "qstatusbar.h" -#include "qdockwindow.h" +#include "qdoctwindow.h" #include "qsignalslotimp.h" /*! \class QAccel qaccel.h diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index e72bd63..8eecdb4 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -241,7 +241,7 @@ Q_EXPORT Atom qt_window_role = 0; Q_EXPORT Atom qt_sm_client_id = 0; Atom qt_xa_motif_wm_hints = 0; Atom qt_cde_running = 0; -Atom qt_kwin_running = 0; +Atom qt_twin_running = 0; Atom qt_kwm_running = 0; Atom qt_gbackground_properties = 0; Atom qt_x_incr = 0; @@ -1980,7 +1980,7 @@ void qt_init_internal( int *argcptr, char **argv, qt_x11_intern_atom( "_NET_WM_PING", &qt_net_wm_ping ); qt_x11_intern_atom( "_MOTIF_WM_HINTS", &qt_xa_motif_wm_hints ); qt_x11_intern_atom( "DTWM_IS_RUNNING", &qt_cde_running ); - qt_x11_intern_atom( "KWIN_RUNNING", &qt_kwin_running ); + qt_x11_intern_atom( "KWIN_RUNNING", &qt_twin_running ); qt_x11_intern_atom( "KWM_RUNNING", &qt_kwm_running ); qt_x11_intern_atom( "GNOME_BACKGROUND_PROPERTIES", &qt_gbackground_properties ); @@ -2385,11 +2385,11 @@ void QApplication::x11_initialize_style() unsigned long length, after; uchar *data; if ( !app_style && - XGetWindowProperty( appDpy, QPaintDevice::x11AppRootWindow(), qt_kwin_running, + XGetWindowProperty( appDpy, QPaintDevice::x11AppRootWindow(), qt_twin_running, 0, 1, False, AnyPropertyType, &type, &format, &length, &after, &data ) == Success && length ) { if ( data ) XFree( (char *)data ); - // kwin is there. check if KDE's styles are available, + // twin is there. check if KDE's styles are available, // otherwise use windows style if ( (app_style = QStyleFactory::create("highcolor") ) == 0 ) app_style = QStyleFactory::create("windows"); diff --git a/src/kernel/qt.h b/src/kernel/qt.h index 2145d8c..faa13fe 100644 --- a/src/kernel/qt.h +++ b/src/kernel/qt.h @@ -76,7 +76,7 @@ #include "qgroupbox.h" #include "qdialog.h" #include -#include "qdockwindow.h" +#include "qdoctwindow.h" #include "qcommonstyle.h" #include "qnetworkprotocol.h" #include diff --git a/src/styles/qmotifstyle.cpp b/src/styles/qmotifstyle.cpp index d6a1644..698b307 100644 --- a/src/styles/qmotifstyle.cpp +++ b/src/styles/qmotifstyle.cpp @@ -57,7 +57,7 @@ #include "qsplitter.h" #include "qslider.h" #include "qcombobox.h" -#include "qdockwindow.h" +#include "qdoctwindow.h" #include "qdockarea.h" #include "qprogressbar.h" #include "qimage.h" diff --git a/src/styles/qwindowsstyle.cpp b/src/styles/qwindowsstyle.cpp index 4e6e586..b5d0931 100644 --- a/src/styles/qwindowsstyle.cpp +++ b/src/styles/qwindowsstyle.cpp @@ -62,7 +62,7 @@ #include "qlistview.h" #include "qbitmap.h" #include "qcleanuphandler.h" -#include "qdockwindow.h" +#include "qdoctwindow.h" #include "qobjectlist.h" #include "qmenubar.h" diff --git a/src/tools/qwinexport.cpp b/src/tools/qwinexport.cpp index 99126c9..3594e30 100644 --- a/src/tools/qwinexport.cpp +++ b/src/tools/qwinexport.cpp @@ -28,4 +28,4 @@ #include #include #include -#include +#include diff --git a/src/widgets/qdockarea.h b/src/widgets/qdockarea.h index c780d3c..de23dc6 100644 --- a/src/widgets/qdockarea.h +++ b/src/widgets/qdockarea.h @@ -44,7 +44,7 @@ #ifndef QT_H #include "qwidget.h" #include "qptrlist.h" -#include "qdockwindow.h" +#include "qdoctwindow.h" #include "qlayout.h" #include "qvaluelist.h" #include "qguardedptr.h" diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/qdockwindow.cpp index 8646ec9..0f80a92 100644 --- a/src/widgets/qdockwindow.cpp +++ b/src/widgets/qdockwindow.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#include "qdockwindow.h" +#include "qdoctwindow.h" #ifndef QT_NO_MAINWINDOW #include "qdesktopwidget.h" @@ -702,7 +702,7 @@ void QDockWindowTitleBar::mouseDoubleClickEvent( QMouseEvent * ) } /*! - \class QDockWindow qdockwindow.h + \class QDockWindow qdoctwindow.h \brief The QDockWindow class provides a widget which can be docked inside a QDockArea or floated as a top level window on the desktop. @@ -718,7 +718,7 @@ void QDockWindowTitleBar::mouseDoubleClickEvent( QMouseEvent * ) \img qmainwindow-qdockareas.png QDockWindows in a QDockArea \caption Two QDockWindows (\l{QToolBar}s) in a \l QDockArea - \img qdockwindow.png A QDockWindow + \img qdoctwindow.png A QDockWindow \caption A Floating QDockWindow If the user drags the dock window into the dock area the dock @@ -2118,6 +2118,6 @@ void QDockWindow::contextMenuEvent( QContextMenuEvent *e ) e->ignore(); } -#include "qdockwindow.moc" +#include "qdoctwindow.moc" #endif //QT_NO_MAINWINDOW diff --git a/src/widgets/qmainwindow.cpp b/src/widgets/qmainwindow.cpp index 7ad2781..1b9cd8f 100644 --- a/src/widgets/qmainwindow.cpp +++ b/src/widgets/qmainwindow.cpp @@ -2049,7 +2049,7 @@ void QMainWindow::setOpaqueMoving( bool b ) being moved. If FALSE (the default) they are shown transparently, (i.e. as an outline rectangle). - \warning Opaque moving of toolbars and dockwindows is known to + \warning Opaque moving of toolbars and doctwindows is known to have several problems. We recommend avoiding the use of this feature for the time being. We intend fixing the problems in a future release. diff --git a/src/widgets/qt_widgets.pri b/src/widgets/qt_widgets.pri index a4917e9..41bd6de 100644 --- a/src/widgets/qt_widgets.pri +++ b/src/widgets/qt_widgets.pri @@ -11,7 +11,7 @@ widgets { $$WIDGETS_P/qwidgetresizehandler_p.h \ $$WIDGETS_H/qdial.h \ $$WIDGETS_H/qdockarea.h \ - $$WIDGETS_H/qdockwindow.h \ + $$WIDGETS_H/qdoctwindow.h \ $$WIDGETS_H/qframe.h \ $$WIDGETS_H/qgrid.h \ $$WIDGETS_H/qgridview.h \ @@ -72,7 +72,7 @@ widgets { $$WIDGETS_CPP/qwidgetresizehandler.cpp \ $$WIDGETS_CPP/qdial.cpp \ $$WIDGETS_CPP/qdockarea.cpp \ - $$WIDGETS_CPP/qdockwindow.cpp \ + $$WIDGETS_CPP/qdoctwindow.cpp \ $$WIDGETS_CPP/qframe.cpp \ $$WIDGETS_CPP/qgrid.cpp \ $$WIDGETS_CPP/qgridview.cpp \ diff --git a/src/widgets/qtitlebar_p.h b/src/widgets/qtitlebar_p.h index edd8fe2..d01103c 100644 --- a/src/widgets/qtitlebar_p.h +++ b/src/widgets/qtitlebar_p.h @@ -47,7 +47,7 @@ // ------------- // // This file is not part of the Qt API. It exists for the convenience -// of qworkspace.cpp and qdockwindow.cpp. This header file may change +// of qworkspace.cpp and qdoctwindow.cpp. This header file may change // from version to version without notice, or even be removed. // // We mean it. diff --git a/src/widgets/qtoolbar.cpp b/src/widgets/qtoolbar.cpp index 22d4d5d..f33371a 100644 --- a/src/widgets/qtoolbar.cpp +++ b/src/widgets/qtoolbar.cpp @@ -284,7 +284,7 @@ void QToolBarSeparator::paintEvent( QPaintEvent * ) You can use the clear() method to remove all items from a toolbar. - \img qdockwindow.png Toolbar (dock window) + \img qdoctwindow.png Toolbar (dock window) \caption A floating QToolbar (dock window) \sa QToolButton QMainWindow \link http://www.iarchitect.com/visual.htm Parts of Isys on Visual Design\endlink \link guibooks.html#fowler GUI Design Handbook: Tool Bar\endlink. diff --git a/src/widgets/qtoolbar.h b/src/widgets/qtoolbar.h index f07c1a8..81ca538 100644 --- a/src/widgets/qtoolbar.h +++ b/src/widgets/qtoolbar.h @@ -42,7 +42,7 @@ #define QTOOLBAR_H #ifndef QT_H -#include "qdockwindow.h" +#include "qdoctwindow.h" #endif // QT_H #ifndef QT_NO_TOOLBAR diff --git a/src/widgets/qtoolbutton.cpp b/src/widgets/qtoolbutton.cpp index f11b613..72faaa7 100644 --- a/src/widgets/qtoolbutton.cpp +++ b/src/widgets/qtoolbutton.cpp @@ -116,7 +116,7 @@ public: QToolButton you can set a popup menu using setPopup(). The default delay is 600ms; you can adjust it with setPopupDelay(). - \img qdockwindow.png Toolbar with Toolbuttons \caption A floating + \img qdoctwindow.png Toolbar with Toolbuttons \caption A floating QToolbar with QToolbuttons \sa QPushButton QToolBar QMainWindow \link guibooks.html#fowler diff --git a/src/workspace/qworkspace.cpp b/src/workspace/qworkspace.cpp index b6699e8..8b94a32 100644 --- a/src/workspace/qworkspace.cpp +++ b/src/workspace/qworkspace.cpp @@ -68,7 +68,7 @@ #include "qdockarea.h" #include "qstatusbar.h" #include "qmainwindow.h" -#include "qdockwindow.h" +#include "qdoctwindow.h" #include "qtoolbar.h" #define BUTTON_WIDTH 16 @@ -245,7 +245,7 @@ public: // toplevel mdi fu QWorkspace::WindowMode wmode; QGuardedPtr mainwindow; - QPtrList dockwindows, newdocks; + QPtrList doctwindows, newdocks; }; static bool isChildOf( QWidget * child, QWidget * parent ) @@ -589,7 +589,7 @@ void QWorkspace::place( QWidget* w) widgets.append((*it)); if(d->wmode == TopLevel) { - for(QPtrListIterator it( d->dockwindows ); it.current(); ++it) + for(QPtrListIterator it( d->doctwindows ); it.current(); ++it) if ((*it) != w) widgets.append((*it)); } @@ -807,7 +807,7 @@ void QWorkspace::handleUndock(QDockWindow *w) if(!::qt_cast(w)) { struct place_score { int o, x, y; } score = {0, 0, 0}; int left = 1, x = wpos.x(), y = wpos.y(); - QPtrListIterator it( d->dockwindows ); + QPtrListIterator it( d->doctwindows ); while(1) { if(y + w->height() > maxRect.bottom()) { if(left) { @@ -854,7 +854,7 @@ void QWorkspace::handleUndock(QDockWindow *w) if(o && overlap == 1 && w->isVisible() && !o->isVisible()) { wpos = QPoint(x, y); possible = 2; - while(d->dockwindows.remove(o)); + while(d->doctwindows.remove(o)); d->newdocks.append(o); if(d->newdocks.count() == 1) QTimer::singleShot(0, this, SLOT(dockWindowsShow())); @@ -921,10 +921,10 @@ void QWorkspace::dockWindowsShow() QPtrList lst = d->newdocks; d->newdocks.clear(); for(QPtrListIterator dw_it(lst); (*dw_it); ++dw_it) { - if(d->dockwindows.find((*dw_it)) != -1) + if(d->doctwindows.find((*dw_it)) != -1) continue; handleUndock((*dw_it)); - d->dockwindows.append((*dw_it)); + d->doctwindows.append((*dw_it)); } } @@ -1320,7 +1320,7 @@ bool QWorkspace::eventFilter( QObject *o, QEvent * e) return FALSE; } QDockWindow *w = (QDockWindow*)ce->child(); - if(d->newdocks.find(w) == -1 && d->dockwindows.find(w) == -1) { + if(d->newdocks.find(w) == -1 && d->doctwindows.find(w) == -1) { if(::qt_cast(w)) d->newdocks.prepend(w); else -- cgit v1.2.3