[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdesdk/kioslave/svn/ksvnd
From: Laurent Montel <montel () kde ! org>
Date: 2007-04-12 9:33:50
Message-ID: 1176370430.927359.7829.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 652913 by mlaurent:
Implement dbus interface
M +2 -3 CMakeLists.txt
M +22 -13 ksvnd.cpp
M +11 -13 ksvnd.h
A org.kde.ksvnd.xml
--- trunk/KDE/kdesdk/kioslave/svn/ksvnd/CMakeLists.txt #652912:652913
@@ -2,13 +2,12 @@
########### next target ###############
set(kded_ksvnd_PART_SRCS ksvnd.cpp )
+qt4_add_dbus_adaptor( kded_ksvnd_PART_SRCS org.kde.ksvnd.xml ksvnd.h KSvnd )
kde4_automoc(${kded_ksvnd_PART_SRCS})
kde4_add_ui3_files(kded_ksvnd_PART_SRCS commitdlg.ui )
-#kde4_add_dcop_skels(kded_ksvnd_PART_SRCS ksvnd.h )
-
kde4_add_plugin(kded_ksvnd ${kded_ksvnd_PART_SRCS})
@@ -21,5 +20,5 @@
########### install files ###############
install( FILES ksvnd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
+install( FILES org.kde.ksvnd.xml DESTINATION ${DBUS_INTERFACES_DIR} )
-
--- trunk/KDE/kdesdk/kioslave/svn/ksvnd/ksvnd.cpp #652912:652913
@@ -25,7 +25,7 @@
#include <qdir.h>
#include <qfile.h>
#include <QTextStream>
-
+#include "ksvndadaptor.h"
#include "config.h"
#include "ksvnd.h"
@@ -39,12 +39,13 @@
KSvnd::KSvnd()
: KDEDModule() {
+ new KsvndAdaptor(this);
}
KSvnd::~KSvnd() {
}
-QString KSvnd::commitDialog(QString modifiedFiles) {
+QString KSvnd::commitDialog(const QString &modifiedFiles) {
CommitDlg commitDlg;
commitDlg.setLog( modifiedFiles );
int result = commitDlg.exec();
@@ -54,7 +55,8 @@
return QString::null;
}
-bool KSvnd::AreAnyFilesInSvn( const KUrl::List& wclist ) {
+bool KSvnd::AreAnyFilesInSvn( const QStringList& lst ) {
+ KUrl::List wclist(lst);
for ( QList<KUrl>::const_iterator it = wclist.begin(); it != wclist.end() ; ++it ) {
kDebug( 7128 ) << "Checking file " << ( *it ) << endl;
QDir bdir ( ( *it ).path() );
@@ -68,7 +70,8 @@
return false;
}
-bool KSvnd::AreAnyFilesNotInSvn( const KUrl::List& wclist ) {
+bool KSvnd::AreAnyFilesNotInSvn( const QStringList& lst ) {
+ KUrl::List wclist(lst);
for ( QList<KUrl>::const_iterator it = wclist.begin(); it != wclist.end() ; ++it ) {
kDebug( 7128 ) << "Checking file " << ( *it ) << endl;
QDir bdir ( ( *it ).path() );
@@ -82,7 +85,8 @@
return false;
}
-bool KSvnd::AreAllFilesInSvn( const KUrl::List& wclist ) {
+bool KSvnd::AreAllFilesInSvn( const QStringList& lst ) {
+ KUrl::List wclist(lst);
for ( QList<KUrl>::const_iterator it = wclist.begin(); it != wclist.end() ; ++it ) {
kDebug( 7128 ) << "Checking file " << ( *it ) << endl;
QDir bdir ( ( *it ).path() );
@@ -96,7 +100,8 @@
return true;
}
-bool KSvnd::AreAllFilesNotInSvn( const KUrl::List& wclist ) {
+bool KSvnd::AreAllFilesNotInSvn( const QStringList& lst ) {
+ KUrl::List wclist(lst);
for ( QList<KUrl>::const_iterator it = wclist.begin(); it != wclist.end() ; ++it ) {
kDebug( 7128 ) << "Checking file " << ( *it ) << endl;
QDir bdir ( ( *it ).path() );
@@ -110,7 +115,7 @@
return true;
}
-bool KSvnd::isFileInSvnEntries ( const QString filename, const QString entfile ) {
+bool KSvnd::isFileInSvnEntries ( const QString &filename, const QString &entfile ) {
QFile file( entfile );
if ( file.open( QIODevice::ReadOnly ) ) {
QTextStream stream( &file );
@@ -127,7 +132,7 @@
return false;
}
-bool KSvnd::isFileInExternals ( const QString filename, const QString propfile ) {
+bool KSvnd::isFileInExternals ( const QString &filename, const QString &propfile ) {
QFile file( propfile );
if ( file.open( QIODevice::ReadOnly ) ) {
QTextStream stream( &file );
@@ -158,7 +163,8 @@
return false;
}
-bool KSvnd::anyNotValidWorkingCopy( const KUrl::List& wclist ) {
+bool KSvnd::anyNotValidWorkingCopy( const QStringList& lst ) {
+ KUrl::List wclist(lst);
bool result = true; //one negative match is enough
for ( QList<KUrl>::const_iterator it = wclist.begin(); it != wclist.end() ; ++it ) {
//exception for .svn dirs
@@ -178,7 +184,8 @@
return result;
}
-bool KSvnd::anyValidWorkingCopy( const KUrl::List& wclist ) {
+bool KSvnd::anyValidWorkingCopy( const QStringList &lst ) {
+ KUrl::List wclist(lst);
for ( QList<KUrl>::const_iterator it = wclist.begin(); it != wclist.end() ; ++it ) {
//skip .svn dirs
if ( ( *it ).path(KUrl::RemoveTrailingSlash).endsWith( "/.svn" ) )
@@ -255,7 +262,8 @@
return d.exists();
}
-QStringList KSvnd::getActionMenu ( const KUrl::List &list ) {
+QStringList KSvnd::getActionMenu ( const QStringList &lst ) {
+ KUrl::List list(lst);
QStringList result;
int listStatus = getStatus( list );
@@ -305,9 +313,10 @@
return result;
}
-QStringList KSvnd::getTopLevelActionMenu ( const KUrl::List &list ) {
+QStringList KSvnd::getTopLevelActionMenu ( const QStringList &lst ) {
+ KUrl::List wclist(lst);
QStringList result;
- int listStatus = getStatus( list );
+ int listStatus = getStatus( lst );
if ( ( listStatus & AllParentsHaveSvn &&
--- trunk/KDE/kdesdk/kioslave/svn/ksvnd/ksvnd.h #652912:652913
@@ -38,21 +38,19 @@
public Q_SLOTS: //dbus function for me KUrl::List must be changed
// void addAuthInfo(KIO::AuthInfo, long);
- QString commitDialog(QString);
- bool anyNotValidWorkingCopy( const KUrl::List& wclist );
- bool anyValidWorkingCopy( const KUrl::List& wclist );
- bool AreAnyFilesNotInSvn( const KUrl::List& wclist );
- bool AreAnyFilesInSvn( const KUrl::List& wclist );
- bool AreAllFilesNotInSvn( const KUrl::List& wclist );
- bool AreAllFilesInSvn( const KUrl::List& wclist );
- QStringList getActionMenu ( const KUrl::List& list );
- QStringList getTopLevelActionMenu ( const KUrl::List &list );
+ QString commitDialog(const QString&);
+ bool anyNotValidWorkingCopy( const QStringList& wclist );
+ bool anyValidWorkingCopy( const QStringList& wclist );
+ bool AreAnyFilesNotInSvn( const QStringList& wclist );
+ bool AreAnyFilesInSvn( const QStringList& wclist );
+ bool AreAllFilesNotInSvn( const QStringList& wclist );
+ bool AreAllFilesInSvn( const QStringList& wclist );
+ QStringList getActionMenu ( const QStringList& list );
+ QStringList getTopLevelActionMenu ( const QStringList &list );
-public slots:
-
protected:
- bool isFileInSvnEntries ( const QString filename, const QString entfile );
- bool isFileInExternals ( const QString filename, const QString propfile );
+ bool isFileInSvnEntries ( const QString &filename, const QString &entfile );
+ bool isFileInExternals ( const QString &filename, const QString &propfile );
bool isFolder( const KUrl& url );
int getStatus( const KUrl::List& list );
};
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic