[Uml-devel] KDE/kdesdk
Laurent Montel
montel at kde.org
Tue Apr 3 08:40:00 UTC 2007
SVN commit 649828 by mlaurent:
Compile++
M +2 -2 kbabel/catalogmanager/catalogmanager.cpp
M +1 -1 kbabel/catalogmanager/catalogmanagerapp.h
M +2 -2 kbabel/catalogmanager/catalogmanagerview.cpp
M +3 -3 kbabel/catalogmanager/main.cpp
M +5 -5 kbabel/kbabel/kbabel.cpp
M +9 -9 kbabel/kbabel/kbabelinterface.cpp
M +1 -1 kbabel/kbabel/kbabelinterface.h
M +3 -3 kbabel/kbabel/kbabelview.cpp
M +2 -2 kbabel/kbabel/main.cpp
M +2 -2 kbabel/kbabeldict/kbabeldictbox.cpp
M +2 -2 kbabel/kbabeldict/main.cpp
M +3 -3 umbrello/umbrello/main.cpp
M +1 -1 umbrello/umbrello/messagewidgetcontroller.cpp
M +1 -1 umbrello/umbrello/objectwidgetcontroller.cpp
M +2 -2 umbrello/umbrello/uml.cpp
M +3 -3 umbrello/umbrello/umlwidgetcontroller.cpp
--- trunk/KDE/kdesdk/kbabel/catalogmanager/catalogmanager.cpp #649827:649828
@@ -80,7 +80,7 @@
#include <kstandarddirs.h>
#include <kstatusbar.h>
#include <ktoolbar.h>
-#include <kwin.h>
+#include <kwm.h>
#include <kxmlguifactory.h>
#include <qfileinfo.h>
@@ -173,7 +173,7 @@
connect(_catalogManager, SIGNAL(selectedChanged(uint)),
this, SLOT(selectedChanged(uint)));
#ifdef Q_OS_UNIX
- KWin::setIcons(winId(),BarIcon("catalogmanager",32)
+ KWM::setIcons(winId(),BarIcon("catalogmanager",32)
,SmallIcon("catalogmanager"));
#endif
QHBoxLayout* hBoxL = new QHBoxLayout();
--- trunk/KDE/kdesdk/kbabel/catalogmanager/catalogmanagerapp.h #649827:649828
@@ -40,7 +40,7 @@
#include "version.h"
#include <kapplication.h>
-#include <kwin.h>
+#include <kwm.h>
//Added by qt3to4:
class CatalogManagerInterface : public QObject
--- trunk/KDE/kdesdk/kbabel/catalogmanager/catalogmanagerview.cpp #649827:649828
@@ -77,7 +77,7 @@
#include <kaction.h>
#include <kfiledialog.h>
#include <kio/netaccess.h>
-#include <kwin.h>
+#include <kwm.h>
#include <kdeversion.h>
#include <ktemporaryfile.h>
@@ -1793,7 +1793,7 @@
cvshandler->setPOTBaseDir( _settings.potBaseDir );
svnhandler->setPOTBaseDir( _settings.potBaseDir );
- setCursor(KCursor::waitCursor());
+ setCursor(Qt::WaitCursor);
//"/" is the root item
buildDir("/",true); // build dir without updating the items...
--- trunk/KDE/kdesdk/kbabel/catalogmanager/main.cpp #649827:649828
@@ -49,7 +49,7 @@
#include <kiconloader.h>
#include <kmessagebox.h>
#include <kapplication.h>
-#include <kwin.h>
+#include <kwm.h>
#include <kmainwindow.h>
#include <qfile.h>
@@ -81,7 +81,7 @@
{
_view->raise();
#ifdef Q_OS_UNIX
- KWin::activateWindow(_view->winId());
+ KWM::activateWindow(_view->winId());
#endif
}
}
@@ -148,7 +148,7 @@
_view->show();
_view->raise();
#ifdef Q_OS_UNIX
- KWin::activateWindow(_view->winId());
+ KWM::activateWindow(_view->winId());
#endif
args->clear();
}
--- trunk/KDE/kdesdk/kbabel/kbabel/kbabel.cpp #649827:649828
@@ -88,7 +88,7 @@
#include <qprogressbar.h>
#include <kpushbutton.h>
#include <kmessagebox.h>
-#include <kwin.h>
+#include <kwm.h>
#include <kaction.h>
#include <kstandardaction.h>
#include <k3spelldlg.h>
@@ -1143,7 +1143,7 @@
if(view)
{
#ifdef Q_OS_UNIX
- KWin::activateWindow(view->topLevelWidget()->winId());
+ KWM::activateWindow(view->topLevelWidget()->winId());
#endif
return;
}
@@ -1165,7 +1165,7 @@
{
kDebug(KBABEL) << "there is a such view" << endl;
#ifdef Q_OS_UNIX
- KWin::activateWindow(view->topLevelWidget()->winId());
+ KWM::activateWindow(view->topLevelWidget()->winId());
#endif
return;
}
@@ -1368,7 +1368,7 @@
_prefDialog->raise();
#ifdef Q_OS_UNIX
- KWin::activateWindow(_prefDialog->winId());
+ KWM::activateWindow(_prefDialog->winId());
#endif
}
@@ -1957,7 +1957,7 @@
_projectDialog->raise();
#ifdef Q_OS_UNIX
- KWin::activateWindow(_projectDialog->winId());
+ KWM::activateWindow(_projectDialog->winId());
#endif
}
--- trunk/KDE/kdesdk/kbabel/kbabel/kbabelinterface.cpp #649827:649828
@@ -28,7 +28,7 @@
if(kb)
{
#ifdef Q_OS_UNIX
- KWin::activateWindow(kb->topLevelWidget()->winId());
+ KWM::activateWindow(kb->topLevelWidget()->winId());
#endif
}
else
@@ -46,7 +46,7 @@
{
kb = static_cast<KBabelMW*>(mw);
#ifdef Q_OS_UNIX
- KWin::activateWindow(kb->topLevelWidget()->winId());
+ KWM::activateWindow(kb->topLevelWidget()->winId());
#endif
kb->open(u, QString::fromUtf8(package),newWindow);
@@ -66,7 +66,7 @@
// here, we don't care about "open in new window", because
// it's empty
#ifdef Q_OS_UNIX
- KWin::activateWindow( kb->topLevelWidget()->winId() );
+ KWM::activateWindow( kb->topLevelWidget()->winId() );
#endif
kb->projectOpen(projectFile);
kb->open(u,QString::fromUtf8(package),false);
@@ -92,7 +92,7 @@
{
kb = static_cast<KBabelMW*>(mw);
#ifdef Q_OS_UNIX
- KWin::activateWindow(kb->topLevelWidget()->winId());
+ KWM::activateWindow(kb->topLevelWidget()->winId());
#endif
kb->open(u, QString::fromUtf8(package),newWindow);
@@ -108,7 +108,7 @@
kb = new KBabelMW(project);
kb->show();
#ifdef Q_OS_UNIX
- KWin::activateWindow(kb->topLevelWidget()->winId());
+ KWM::activateWindow(kb->topLevelWidget()->winId());
#endif
kb->open(u,QString::fromUtf8(package),newWindow);
}
@@ -138,7 +138,7 @@
if(kb)
{
#ifdef Q_OS_UNIX
- KWin::activateWindow(kb->topLevelWidget()->winId());
+ KWM::activateWindow(kb->topLevelWidget()->winId());
#endif
}
else
@@ -154,7 +154,7 @@
{
kb = static_cast<KBabelMW*>(mw);
#ifdef Q_OS_UNIX
- KWin::activateWindow(kb->topLevelWidget()->winId());
+ KWM::activateWindow(kb->topLevelWidget()->winId());
#endif
kb->projectOpen(projectFile);
kb->openTemplate(t,u,QString::fromUtf8(package),newWindow);
@@ -166,7 +166,7 @@
kb = new KBabelMW(project);
kb->show();
#ifdef Q_OS_UNIX
- KWin::activateWindow(kb->topLevelWidget()->winId());
+ KWM::activateWindow(kb->topLevelWidget()->winId());
#endif
kb->openTemplate(t,u,QString::fromUtf8(package));
}
@@ -299,7 +299,7 @@
if(kb)
{
#ifdef Q_OS_UNIX
- KWin::activateWindow(kb->topLevelWidget()->winId());
+ KWM::activateWindow(kb->topLevelWidget()->winId());
#endif
}
}
--- trunk/KDE/kdesdk/kbabel/kbabel/kbabelinterface.h #649827:649828
@@ -3,7 +3,7 @@
#ifndef KBABELINTERFACE_H
#define KBABELINTERFACE_H
-#include <kwin.h>
+#include <kwm.h>
#include <QByteArray>
#include <kurl.h>
#include <kbabel.h>
--- trunk/KDE/kdesdk/kbabel/kbabel/kbabelview.cpp #649827:649828
@@ -82,7 +82,7 @@
#include <ktemporaryfile.h>
#include <k3spell.h>
#include <k3sconfig.h>
-#include <kwin.h>
+#include <kwm.h>
#include <kstandardshortcut.h>
#include <k3urldrag.h>
#include <kglobalsettings.h>
@@ -1091,7 +1091,7 @@
if(checkIfModified && !url.isEmpty() && cu==url)
{
#ifdef Q_OS_UNIX
- KWin::activateWindow(topLevelWidget()->winId());
+ KWM::activateWindow(topLevelWidget()->winId());
#endif
return;
}
@@ -1132,7 +1132,7 @@
}
else {
#ifdef Q_OS_UNIX
- KWin::activateWindow(v->topLevelWidget()->winId());
+ KWM::activateWindow(v->topLevelWidget()->winId());
#endif
return;
}
--- trunk/KDE/kdesdk/kbabel/kbabel/main.cpp #649827:649828
@@ -48,7 +48,7 @@
#include <kmessagebox.h>
#include <kuniqueapplication.h>
-#include <kwin.h>
+#include <kwm.h>
#include <QtDBus/QtDBus>
#include <qfile.h>
@@ -100,7 +100,7 @@
if( showSplash && first )
{
- setOverrideCursor(KCursor::waitCursor());
+ setOverrideCursor(Qt::WaitCursor);
splash = new KBabelSplash();
splash->show();
timer.setSingleShot( true );
--- trunk/KDE/kdesdk/kbabel/kbabeldict/kbabeldictbox.cpp #649827:649828
@@ -53,7 +53,7 @@
#include <kstandarddirs.h>
#include <kglobal.h>
#include <kdebug.h>
-#include <kwin.h>
+#include <kwm.h>
#include <kservicetypetrader.h>
#include <qclipboard.h>
@@ -1520,7 +1520,7 @@
if(w)
{
#ifdef Q_OS_UNIX
- KWin::activateWindow( w->winId() );
+ KWM::activateWindow( w->winId() );
#endif
return;
}
--- trunk/KDE/kdesdk/kbabel/kbabeldict/main.cpp #649827:649828
@@ -38,7 +38,7 @@
#include <kcursor.h>
#include <klocale.h>
#include <kapplication.h>
-#include <kwin.h>
+#include <kwm.h>
#include <qtimer.h>
@@ -69,7 +69,7 @@
{
timer.setSingleShot( true );
timer.start( 2000 );
- KApplication::setOverrideCursor(KCursor::waitCursor());
+ KApplication::setOverrideCursor(Qt::WaitCursor);
splash = new KBabelSplash();
splash->show();
}
--- trunk/KDE/kdesdk/umbrello/umbrello/main.cpp #649827:649828
@@ -19,7 +19,7 @@
#include <klocale.h>
#include <ktip.h>
#include <kdebug.h>
-#include <kwin.h>
+#include <kwm.h>
// app includes
#include "uml.h"
@@ -154,8 +154,8 @@
startLogo = new KStartupLogo(0);
startLogo->setHideEnabled(true);
#ifdef Q_OS_UNIX
- KWin::setMainWindow(startLogo, UMLApp::app()->winId());
- KWin::setState(startLogo->winId(), NET::KeepAbove);
+ KWM::setMainWindow(startLogo, UMLApp::app()->winId());
+ KWM::setState(startLogo->winId(), NET::KeepAbove);
#endif
startLogo->show();
QApplication::flush();
--- trunk/KDE/kdesdk/umbrello/umbrello/messagewidgetcontroller.cpp #649827:649828
@@ -35,7 +35,7 @@
}
QCursor MessageWidgetController::getResizeCursor() {
- return KCursor::sizeVerCursor();
+ return Qt::SizeVerCursor;
}
void MessageWidgetController::resizeWidget(int newW, int newH) {
--- trunk/KDE/kdesdk/umbrello/umbrello/objectwidgetcontroller.cpp #649827:649828
@@ -25,7 +25,7 @@
}
QCursor ObjectWidgetController::getResizeCursor() {
- return KCursor::sizeHorCursor();
+ return Qt::SizeHorCursor;
}
void ObjectWidgetController::resizeWidget(int newW, int newH) {
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.cpp #649827:649828
@@ -951,14 +951,14 @@
slotStatusMsg(i18n("Inserting clipboard contents..."));
QMimeSource* data = QApplication::clipboard()->data();
UMLClipboard clipboard;
- setCursor(KCursor::waitCursor());
+ setCursor(Qt::WaitCursor);
if(!clipboard.paste(data)) {
KMessageBox::sorry( this, i18n("Umbrello could not paste the clipboard contents. "
"The objects in the clipboard may be of the wrong "
"type to be pasted here."), i18n("Paste Error") );
}
slotStatusMsg(i18n("Ready."));
- setCursor(KCursor::arrowCursor());
+ setCursor(Qt::ArrowCursor);
editPaste->setEnabled(false);
m_doc -> setModified( true );
}
--- trunk/KDE/kdesdk/umbrello/umbrello/umlwidgetcontroller.cpp #649827:649828
@@ -229,7 +229,7 @@
if (m_inResizeArea) {
m_inResizeArea = false;
- m_widget->m_pView->setCursor(KCursor::arrowCursor());
+ m_widget->m_pView->setCursor(Qt::ArrowCursor);
} else {
m_inMoveArea = false;
}
@@ -281,13 +281,13 @@
m_widget->m_pView->setCursor(getResizeCursor());
return true;
} else {
- m_widget->m_pView->setCursor(KCursor::arrowCursor());
+ m_widget->m_pView->setCursor(Qt::ArrowCursor);
return false;
}
}
QCursor UMLWidgetController::getResizeCursor() {
- return KCursor::sizeFDiagCursor();
+ return Qt::SizeFDiagCursor;
}
void UMLWidgetController::resizeWidget(int newW, int newH) {
More information about the umbrello-devel
mailing list