[Uml-devel] KDE/kdesdk
Christian Ehrlicher
Ch.Ehrlicher at gmx.de
Fri Mar 20 19:53:34 UTC 2009
SVN commit 941971 by chehrlic:
KUrl::path() -> KUrl::toLocalFile() - fixes
some qt3support--
M +1 -1 kate/app/kateapp.cpp
M +1 -1 kate/app/katemwmodonhddialog.cpp
M +2 -2 kate/app/katesession.cpp
M +13 -13 kioslave/svn/ksvnd/ksvnd.cpp
M +1 -1 kompare/komparepart/komparesaveoptionswidget.cpp
M +2 -2 lokalize/src/tm/tmscanapi.cpp
M +2 -2 umbrello/umbrello/controller/umlwidgetcontroller.cpp
M +2 -2 umbrello/umbrello/toolbarstate.cpp
--- trunk/KDE/kdesdk/kate/app/kateapp.cpp #941970:941971
@@ -194,7 +194,7 @@
for (int z = 0; z < m_args->count(); z++)
{
// this file is no local dir, open it, else warn
- bool noDir = !m_args->url(z).isLocalFile() || !QDir (m_args->url(z).path()).exists();
+ bool noDir = !m_args->url(z).isLocalFile() || !QDir (m_args->url(z).toLocalFile()).exists();
if (noDir)
{
--- trunk/KDE/kdesdk/kate/app/katemwmodonhddialog.cpp #941970:941971
@@ -247,7 +247,7 @@
// Start a KProcess that creates a diff
m_proc = new KProcess( this );
m_proc->setOutputChannelMode( KProcess::MergedChannels );
- *m_proc << "diff" << "-ub" << "-" << doc->url().path();
+ *m_proc << "diff" << "-ub" << "-" << doc->url().toLocalFile();
connect( m_proc, SIGNAL(readyRead()), this, SLOT(slotDataAvailable()) );
connect( m_proc, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotPDone()) );
--- trunk/KDE/kdesdk/kate/app/katesession.cpp #941970:941971
@@ -698,12 +698,12 @@
connect(a, SIGNAL(triggered()), this, SLOT(slotCopySession()));
KateSessionList &slist (KateSessionManager::self()->sessionList());
- kdDebug()<<"Last session is:"<<lastSession;
+ kDebug()<<"Last session is:"<<lastSession;
for (int i = 0; i < slist.count(); ++i)
{
KateSessionChooserItem *item = new KateSessionChooserItem (m_sessions, slist[i]);
- kdDebug()<<"Session added to chooser:"<<slist[i]->sessionName()<<"........"<<slist[i]->sessionFileRelative();
+ kDebug()<<"Session added to chooser:"<<slist[i]->sessionName()<<"........"<<slist[i]->sessionFileRelative();
if (slist[i]->sessionFileRelative() == lastSession)
m_sessions->setCurrentItem (item);
}
--- trunk/KDE/kdesdk/kioslave/svn/ksvnd/ksvnd.cpp #941970:941971
@@ -59,8 +59,8 @@
KUrl::List wclist(lst);
for ( QList<KUrl>::const_iterator it = wclist.begin(); it != wclist.end() ; ++it ) {
kDebug( 7128 ) << "Checking file " << ( *it );
- QDir bdir ( ( *it ).path() );
- if ( bdir.exists() && QFile::exists( ( *it ).path() + "/.svn/entries" ) ) {
+ QDir bdir ( ( *it ).toLocalFile() );
+ if ( bdir.exists() && QFile::exists( ( *it ).toLocalFile() + "/.svn/entries" ) ) {
return true;
} else if ( !bdir.exists() ) {
if ( isFileInSvnEntries( ( *it ).fileName(), ( *it ).directory() + "/.svn/entries" ) || isFileInExternals ( ( *it ).fileName(), ( *it ).directory()+"/.svn/dir-props" ) )
@@ -74,8 +74,8 @@
KUrl::List wclist(lst);
for ( QList<KUrl>::const_iterator it = wclist.begin(); it != wclist.end() ; ++it ) {
kDebug( 7128 ) << "Checking file " << ( *it );
- QDir bdir ( ( *it ).path() );
- if ( bdir.exists() && !QFile::exists( ( *it ).path() + "/.svn/entries" ) ) {
+ QDir bdir ( ( *it ).toLocalFile() );
+ if ( bdir.exists() && !QFile::exists( ( *it ).toLocalFile() + "/.svn/entries" ) ) {
return true;
} else if ( !bdir.exists() ) {
if ( !isFileInSvnEntries( ( *it ).fileName(),( *it ).directory() + "/.svn/entries" ) && !isFileInExternals ( ( *it ).fileName(), ( *it ).directory()+"/.svn/dir-props" ) )
@@ -89,8 +89,8 @@
KUrl::List wclist(lst);
for ( QList<KUrl>::const_iterator it = wclist.begin(); it != wclist.end() ; ++it ) {
kDebug( 7128 ) << "Checking file " << ( *it );
- QDir bdir ( ( *it ).path() );
- if ( bdir.exists() && !QFile::exists( ( *it ).path() + "/.svn/entries" ) ) {
+ QDir bdir ( ( *it ).toLocalFile() );
+ if ( bdir.exists() && !QFile::exists( ( *it ).toLocalFile() + "/.svn/entries" ) ) {
return false;
} else if ( !bdir.exists() ) {
if ( !isFileInSvnEntries( ( *it ).fileName(),( *it ).directory() + "/.svn/entries" ) && !isFileInExternals ( ( *it ).fileName(), ( *it ).directory()+"/.svn/dir-props" ) )
@@ -104,8 +104,8 @@
KUrl::List wclist(lst);
for ( QList<KUrl>::const_iterator it = wclist.begin(); it != wclist.end() ; ++it ) {
kDebug( 7128 ) << "Checking file " << ( *it );
- QDir bdir ( ( *it ).path() );
- if ( bdir.exists() && QFile::exists( ( *it ).path() + "/.svn/entries" ) ) {
+ QDir bdir ( ( *it ).toLocalFile() );
+ if ( bdir.exists() && QFile::exists( ( *it ).toLocalFile() + "/.svn/entries" ) ) {
return false;
} else if ( !bdir.exists() ) {
if ( isFileInSvnEntries( ( *it ).fileName(),( *it ).directory() + "/.svn/entries" ) || isFileInExternals ( ( *it ).fileName(), ( *it ).directory()+"/.svn/dir-props" ) )
@@ -188,9 +188,9 @@
if ( ( *it ).path(KUrl::RemoveTrailingSlash).endsWith( "/.svn" ) )
return true;
//if is a directory check whether it contains a .svn/entries file
- QDir dir( ( *it ).path() );
+ QDir dir( ( *it ).toLocalFile() );
if ( dir.exists() ) { //it's a dir
- if ( !QFile::exists( ( *it ).path() + "/.svn/entries" ) )
+ if ( !QFile::exists( ( *it ).toLocalFile() + "/.svn/entries" ) )
result = false;
}
@@ -208,9 +208,9 @@
if ( ( *it ).path(KUrl::RemoveTrailingSlash).endsWith( "/.svn" ) )
continue;
//if is a directory check whether it contains a .svn/entries file
- QDir dir( ( *it ).path() );
+ QDir dir( ( *it ).toLocalFile() );
if ( dir.exists() ) { //it's a dir
- if ( QFile::exists( ( *it ).path() + "/.svn/entries" ) )
+ if ( QFile::exists( ( *it ).toLocalFile() + "/.svn/entries" ) )
return true;
}
@@ -233,7 +233,7 @@
if ( isFileInSvnEntries ( (*it).fileName(),( *it ).directory() + "/.svn/entries" ) ) { // normal subdir known in the working copy
parentsentries++;
} else if ( isFolder( *it ) ) { // other subfolders (either another module checkouted or an external, or something not known at all)
- if ( QFile::exists( ( *it ).path() + "/.svn/entries" ) )
+ if ( QFile::exists( ( *it ).toLocalFile() + "/.svn/entries" ) )
subdirhavesvn++;
if ( isFileInExternals( (*it).fileName(), ( *it ).directory() + "/.svn/dir-props" ) ) {
external++;
--- trunk/KDE/kdesdk/kompare/komparepart/komparesaveoptionswidget.cpp #941970:941971
@@ -86,7 +86,7 @@
QString KompareSaveOptionsWidget::directory() const
{
- return KUrl( m_directoryRequester->url() ).path();
+ return KUrl( m_directoryRequester->url() ).toLocalFile();
}
void KompareSaveOptionsWidget::updateCommandLine()
--- trunk/KDE/kdesdk/lokalize/src/tm/tmscanapi.cpp #941970:941971
@@ -75,7 +75,7 @@
}
else
{
- count+=doScanRecursive(QDir(urls.at(i).path()),dbName,metaJob);
+ count+=doScanRecursive(QDir(urls.at(i).toLocalFile()),dbName,metaJob);
}
}
if (count)
@@ -121,7 +121,7 @@
bool ok=Catalog::extIsSupported(urls.at(i).path());
if (!ok)
{
- QFileInfo info(urls.at(i).path());
+ QFileInfo info(urls.at(i).toLocalFile());
ok=info.exists() && info.isDir();
}
if (ok)
--- trunk/KDE/kdesdk/umbrello/umbrello/controller/umlwidgetcontroller.cpp #941970:941971
@@ -270,11 +270,11 @@
//Cancel move/edit
QMouseEvent move(QMouseEvent::MouseMove,
QPoint(m_oldX + m_pressOffsetX, m_oldY + m_pressOffsetY),
- Qt::LeftButton, Qt::NoButton);
+ Qt::LeftButton, Qt::NoButton, Qt::NoModifier);
mouseMoveEvent(&move);
QMouseEvent release(QMouseEvent::MouseButtonRelease,
QPoint(m_oldX + m_pressOffsetX, m_oldY + m_pressOffsetY),
- Qt::LeftButton, Qt::NoButton);
+ Qt::LeftButton, Qt::NoButton, Qt::NoModifier);
mouseReleaseEvent(&release);
}
}
--- trunk/KDE/kdesdk/umbrello/umbrello/toolbarstate.cpp #941970:941971
@@ -237,7 +237,7 @@
}
void ToolBarState::changeTool() {
- if (m_pMouseEvent->state() == Qt::RightButton) {
+ if (m_pMouseEvent->buttons() == Qt::RightButton) {
UMLApp::app()->getWorkToolBar()->setDefaultTool();
}
}
@@ -246,7 +246,7 @@
if (m_pMouseEvent) delete m_pMouseEvent;
m_pMouseEvent = new QMouseEvent(type, m_pUMLView->inverseWorldMatrix().map(ome->pos()),
- ome->button(),ome->state());
+ ome->button(),ome->buttons(),ome->modifiers());
}
MessageWidget* ToolBarState::getMessageAt(const QPoint& pos) {
More information about the umbrello-devel
mailing list