Hello community, here is the log from the commit of package smb4k for openSUSE:Factory checked in at 2011-12-07 14:40:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/smb4k (Old) and /work/SRC/openSUSE:Factory/.smb4k.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "smb4k", Maintainer is "kde-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/smb4k/smb4k.changes 2011-09-23 12:46:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.smb4k.new/smb4k.changes 2011-12-07 14:40:28.000000000 +0100 @@ -1,0 +2,26 @@ +Sun Dec 4 20:52:33 UTC 2011 - asterios.dra...@gmail.com + +- Spec file updates: + * Changed License: to GPL-2.0+ (SPDX style). + * Recommend instead of Suggest doc and lang subpackages. + * Removed Provides:/Obsoletes: entries for kde4-smb4k (not needed anymore). + +------------------------------------------------------------------- +Sun Dec 4 18:41:36 UTC 2011 - tittiatc...@gmail.com + +- Update to version 0.10.12: + * Fixed wrong QString to char conversion in the mounter. + * Adjusted author's e-mail address and the project's home page + and bug report mailing list addresses due to the relocation of + Smb4K to Sourceforge.net. + * The application is using UTF8 now. This should fix the + incompatibility with non-Latin1 languages. + * Smb4KAuthInfo::login() and Smb4KAuthInfo::password() return a + QString. + * Smb4KShare::path() and Smb4KShare::canonicalPath() return a + QString. + * Connect configuration dialog with system tray widget, so that + changes can directly be applied. + * Fixed KLibrary warnings during runtime. + +------------------------------------------------------------------- Old: ---- smb4k-0.10.10.tar.bz2 New: ---- smb4k-0.10.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smb4k.spec ++++++ --- /var/tmp/diff_new_pack.vcZk9H/_old 2011-12-07 14:40:29.000000000 +0100 +++ /var/tmp/diff_new_pack.vcZk9H/_new 2011-12-07 14:40:29.000000000 +0100 @@ -18,27 +18,26 @@ Name: smb4k -Version: 0.10.10 +Version: 0.10.12 Release: 1 -License: GPLv2+ +License: GPL-2.0+ Summary: Advanced Network Neighborhood Browser for KDE -Url: http://smb4k.berlios.de/ +Url: http://smb4k.sourceforge.net/ Group: Productivity/Networking/Samba -Source0: http://download.berlios.de/smb4k/%{name}-%{version}.tar.bz2 +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 BuildRequires: fdupes BuildRequires: gettext BuildRequires: libkde4-devel Requires: cifs-utils Requires: samba-client +Recommends: %{name}-doc = %{version} +Recommends: %{name}-lang = %{version} Recommends: enscript Recommends: rsync Recommends: texlive -Provides: kde4-smb4k = %{version} +# smb4k-devel was last used in openSUSE-11.4 (version 0.10.9) Provides: smb4k-devel = %{version} -Obsoletes: kde4-smb4k <= 0.10.2 -Obsoletes: smb4k-devel <= 0.10.2 -Suggests: %{name}-doc = %{version} -Suggests: %{name}-lang = %{version} +Obsoletes: smb4k-devel <= 0.10.9 BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires @@ -49,7 +48,7 @@ %package doc Summary: Documentation for smb4k -Group: Productivity/Networking/Samba +Group: Documentation/HTML Requires: %{name} = %{version} %description doc @@ -57,42 +56,39 @@ programs of the Samba software suite. Its purpose is to provide a program that's easy to use and has as many features as possible. -This package provides the documentation for smb4k +This package provides the documentation for smb4k. %lang_package %prep %setup -q # Fix po file name mv po/pt/pt.po po/pt/smb4k.po -# Fix permissions -chmod 644 AUTHORS BUGS COPYING FAQ README TODO %build %cmake_kde4 -d build %make_jobs %install - cd build - %kde4_makeinstall - cd .. - - # Not needed, fix "devel-file-in-non-devel-package" rpmlint warning - rm -f %{buildroot}%{_kde4_libdir}/libsmb4kcore.so - # - - %if 0%{?suse_version} - %suse_update_desktop_file -r %{name} Qt KDE System Network - %endif - - %fdupes -s %{buildroot} - %find_lang %{name} - %kde_post_install +cd build +%kde4_makeinstall +cd .. + +# Not needed, fix "devel-file-in-non-devel-package" rpmlint warning +rm -f %{buildroot}%{_kde4_libdir}/libsmb4kcore.so + +%if 0%{?suse_version} +%suse_update_desktop_file -r %{name} Qt KDE System Network +%endif + +%fdupes -s %{buildroot} + +%find_lang %{name} + +%kde_post_install %post -p /sbin/ldconfig -%postun -p /sbin/ldconfig -%clean -rm -rf %{buildroot} +%postun -p /sbin/ldconfig %files %defattr(-,root,root,-) @@ -103,11 +99,11 @@ %{_kde4_appsdir}/smb4k/ %{_kde4_bindir}/smb4k %{_kde4_bindir}/smb4k_* -%config %{_kde4_configkcfgdir}/smb4k.kcfg +%{_kde4_configkcfgdir}/smb4k.kcfg %{_kde4_iconsdir}/*/*/apps/smb4k.png %{_kde4_libdir}/libsmb4kcore.so* %{_kde4_libdir}/libsmb4kdialogs.so -%{_kde4_modulesdir}/libsmb4k*.so +%{_kde4_modulesdir}/smb4k*.so %files lang -f %{name}.lang %defattr(-,root,root,-) ++++++ smb4k-0.10.10.tar.bz2 -> smb4k-0.10.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/CMakeLists.txt new/smb4k-0.10.12/CMakeLists.txt --- old/smb4k-0.10.10/CMakeLists.txt 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/CMakeLists.txt 2011-12-04 09:47:05.000000000 +0100 @@ -1,9 +1,9 @@ project( smb4k ) -set( VERSION 0.10.10 ) +set( VERSION 0.10.12 ) set( VERSION_MAJOR 0 ) set( VERSION_MINOR 10 ) -set( VERSION_PATCH 10 ) +set( VERSION_PATCH 12 ) cmake_minimum_required( VERSION 2.6 ) @@ -70,7 +70,8 @@ "^${PROJECT_SOURCE_DIR}.*/CVS/" "^${PROJECT_SOURCE_DIR}/Messages.sh" "^${PROJECT_SOURCE_DIR}/po/scripts/" - "^${PROJECT_SOURCE_DIR}/*.kdev4" + "^${PROJECT_SOURCE_DIR}/*.kdev4" + "^${PROJECT_SOURCE_DIR}.*/.svn/" "^${PROJECT_SOURCE_DIR}/build/" ) include( CPack ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/ChangeLog new/smb4k-0.10.12/ChangeLog --- old/smb4k-0.10.10/ChangeLog 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/ChangeLog 2011-12-04 09:47:05.000000000 +0100 @@ -1,3 +1,18 @@ +Smb4K 0.10.12: +- Fixed wrong QString to char conversion in the mounter. +- Adjusted author's e-mail address and the project's home page and bug + report mailing list addresses due to the relocation of Smb4K to + Sourceforge.net. + +Smb4K 0.10.11: +- The application is using UTF8 now. This should fix the incompatibility + with non-Latin1 languages. +- Smb4KAuthInfo::login() and Smb4KAuthInfo::password() return a QString. +- Smb4KShare::path() and Smb4KShare::canonicalPath() return a QString. +- Connect configuration dialog with system tray widget, so that changes + can directly be applied. +- Fixed KLibrary warnings during runtime. + Smb4K 0.10.10: - Fixed "Invalid command: net rap share list" error. - Improved smb4k_sudowriter utility program. Version has been bumped to 0.4. @@ -12,14 +27,14 @@ - Fixed crashes in Smb4KScanner::scanForWorkgroupMembers(). Smb4K 0.10.7: -- Replace broken backported smb4k_umount binary with a fixed one from the +- Replace broken backported smb4k_umount binary with a fixed one from the 0.10 branch. This way you won't get the "unknown argument" errors anymore. Smb4K 0.10.6: - Include files are no longer installed. - Added updated portugese translation. Thanks to Fathi Boudra for sending the link and Américo Monteiro for the translation. -- Fixed missing of shares that have no comment (closes #16837 and presumably +- Fixed missing of shares that have no comment (closes #16837 and presumably also #3009 and #7949). - Fixed listing of shares when a "creating lame ..." message appears on stderr (closes #16849). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/core/smb4kauthinfo.h new/smb4k-0.10.12/core/smb4kauthinfo.h --- old/smb4k-0.10.10/core/smb4kauthinfo.h 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/core/smb4kauthinfo.h 2011-12-04 09:47:05.000000000 +0100 @@ -29,7 +29,6 @@ // Qt includes #include <QString> -#include <QByteArray> #include <QUrl> // KDE includes @@ -182,7 +181,7 @@ * * @returns The login */ - QByteArray login() const { return m_url.userName().toUtf8(); } // Do not use encodedUserName() + QString login() const { return m_url.userName(); } /** * Sets the password. @@ -194,7 +193,7 @@ /** * Returns the password. */ - QByteArray password() const { return m_url.password().toUtf8(); } // Do not use encodedPassword() + QString password() const { return m_url.password(); } /** * Returns the type. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/core/smb4kglobal.cpp new/smb4k-0.10.12/core/smb4kglobal.cpp --- old/smb4k-0.10.10/core/smb4kglobal.cpp 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/core/smb4kglobal.cpp 2011-12-04 09:47:05.000000000 +0100 @@ -115,7 +115,7 @@ } -Smb4KShare* Smb4KGlobal::findShareByPath( const QByteArray &path ) +Smb4KShare* Smb4KGlobal::findShareByPath( const QString &path ) { if ( path.isEmpty() || p.mountedSharesList.isEmpty() ) { @@ -126,11 +126,10 @@ for ( int i = 0; i < Smb4KGlobal::mountedSharesList()->size(); ++i ) { - if ( path.toUpper() == p.mountedSharesList.at( i )->path().toUpper() || - path.toUpper() == p.mountedSharesList.at( i )->canonicalPath().toUpper() ) + if ( QString::compare( path, p.mountedSharesList.at( i )->path(), Qt::CaseInsensitive ) == 0 || + QString::compare( path, p.mountedSharesList.at( i )->canonicalPath(), Qt::CaseInsensitive ) == 0 ) { share = p.mountedSharesList.at( i ); - break; } else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/core/smb4kglobal.h new/smb4k-0.10.12/core/smb4kglobal.h --- old/smb4k-0.10.10/core/smb4kglobal.h 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/core/smb4kglobal.h 2011-12-04 09:47:05.000000000 +0100 @@ -112,7 +112,7 @@ * * @returns the share that is mounted to @p path. */ - KDE_EXPORT Smb4KShare *findShareByPath( const QByteArray &path ); + KDE_EXPORT Smb4KShare *findShareByPath( const QString &path ); /** * Find all mounts of a particular share with UNC @p unc on the system. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/core/smb4kglobal_p.cpp new/smb4k-0.10.12/core/smb4kglobal_p.cpp --- old/smb4k-0.10.10/core/smb4kglobal_p.cpp 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/core/smb4kglobal_p.cpp 2011-12-04 09:47:05.000000000 +0100 @@ -43,7 +43,7 @@ Smb4KGlobalPrivate::~Smb4KGlobalPrivate() { // Remove the temporary directory. - rmdir( m_temp_dir.toLocal8Bit() ); + rmdir( m_temp_dir.toUtf8() ); // Clear the workgroup list. while ( !workgroupsList.isEmpty() ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/core/smb4kipaddressscanner.cpp new/smb4k-0.10.12/core/smb4kipaddressscanner.cpp --- old/smb4k-0.10.10/core/smb4kipaddressscanner.cpp 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/core/smb4kipaddressscanner.cpp 2011-12-04 09:47:05.000000000 +0100 @@ -262,7 +262,7 @@ void Smb4KIPAddressScanner::slotReceivedIPAddresses() { - QString buffer = QString::fromLocal8Bit( m_proc->readAllStandardOutput(), -1 ); + QString buffer = QString::fromUtf8( m_proc->readAllStandardOutput(), -1 ); if ( !buffer.trimmed().isEmpty() ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/core/smb4kmounter.cpp new/smb4k-0.10.12/core/smb4kmounter.cpp --- old/smb4k-0.10.10/core/smb4kmounter.cpp 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/core/smb4kmounter.cpp 2011-12-04 09:47:05.000000000 +0100 @@ -289,7 +289,7 @@ // If the share is already in the list, copy it and do not // create a new entry: - existing_share = findShareByPath( path.toLocal8Bit() ); + existing_share = findShareByPath( path ); if ( existing_share ) { @@ -350,7 +350,7 @@ // If the share is already in the list, copy it and do not // create a new entry: - existing_share = findShareByPath( path.toLocal8Bit() ); + existing_share = findShareByPath( path ); if ( existing_share ) { @@ -425,22 +425,13 @@ } else if ( share->fileSystem() == Smb4KShare::CIFS ) { - if ( (!share->isInaccessible() && - (qstrncmp( share->canonicalPath(), - QDir( Smb4KSettings::mountPrefix().path() ) - .canonicalPath().toLocal8Bit(), - QDir( Smb4KSettings::mountPrefix().path() ) - .canonicalPath().toLocal8Bit().length() ) == 0 || - qstrncmp( share->canonicalPath(), - QDir::home().canonicalPath().toLocal8Bit(), - QDir::home().canonicalPath().toLocal8Bit().length() ) == 0)) || - (share->isInaccessible() && - (qstrncmp( share->path(), - QDir::homePath().toLocal8Bit(), - QDir::homePath().toLocal8Bit().length() ) == 0 || - qstrncmp( share->path(), - Smb4KSettings::mountPrefix().path().toLocal8Bit(), - Smb4KSettings::mountPrefix().path().toLocal8Bit().length() ) == 0)) ) + if ( (share->uid() == getuid() && share->gid() == getgid()) || + (!share->isInaccessible() && + (share->path().startsWith( Smb4KSettings::mountPrefix().path() ) || + share->path().startsWith( QDir::homePath() ))) || + (!share->isInaccessible() && + (share->canonicalPath().startsWith( QDir( Smb4KSettings::mountPrefix().path() ).canonicalPath() ) || + share->canonicalPath().startsWith( QDir::home().canonicalPath() ))) ) { share->setForeign( false ); } @@ -635,7 +626,7 @@ { if ( !list.at( i )->isForeign() ) { - Smb4KShare *mounted_share = findShareByPath( list.at( i )->path() ); + Smb4KShare *mounted_share = findShareByPath( list.at( i )->path().toUtf8() ); emit mounted( mounted_share ); @@ -774,7 +765,7 @@ "" ); command.append( !authInfo.login().isEmpty() ? - QString( "user=%1" ).arg( QString::fromLocal8Bit( authInfo.login() ) ) : + QString( "user=%1" ).arg( authInfo.login() ) : "guest" ); command.append( " -- " ); @@ -823,8 +814,7 @@ command.append( " -- " ); command.append( QString( "//%1@%2:%3/%4 %5" ).arg( !authInfo.login().isEmpty() ? - QString::fromLocal8Bit( authInfo.login() ) : - "guest" ) + authInfo.login() : "guest" ) .arg( KShell::quoteArg( m_priv->share()->host() ) ) .arg( port ) .arg( KShell::quoteArg( m_priv->share()->name() ) ) @@ -859,7 +849,7 @@ } // Compose the unmount command: - if ( !QString::fromLocal8Bit( m_priv->share()->canonicalPath(), -1 ).isEmpty() ) + if ( !m_priv->share()->canonicalPath().isEmpty() ) { bool execute = false; @@ -1141,7 +1131,7 @@ // The Samba programs report their errors to stdout. So, // get the (merged) output from stdout and check if there // was an error. - QString output = QString::fromLocal8Bit( m_proc->readAllStandardOutput(), -1 ).trimmed(); + QString output = QString::fromUtf8( m_proc->readAllStandardOutput(), -1 ).trimmed(); if ( !output.isEmpty() ) { @@ -1319,12 +1309,12 @@ // Get the share. // (We need this to make the removal from the list of mounted shares // work. Otherwise it would be better to just use m_priv->share()!) - Smb4KShare *share = findShareByPath( m_priv->share()->path() ); + Smb4KShare *share = findShareByPath( m_priv->share()->path().toUtf8() ); // The Samba programs report their errors to stdout. So, // get the (merged) output from stdout and check if there // was an error. - QString output = QString::fromLocal8Bit( m_proc->readAllStandardOutput(), -1 ).trimmed(); + QString output = QString::fromUtf8( m_proc->readAllStandardOutput(), -1 ).trimmed(); if ( !output.isEmpty() ) { @@ -1354,9 +1344,7 @@ } else { - if ( qstrncmp( share->canonicalPath(), - QDir( Smb4KSettings::mountPrefix().path() ).canonicalPath().toLocal8Bit(), - QDir( Smb4KSettings::mountPrefix().path() ).canonicalPath().toLocal8Bit().length() ) == 0 ) + if ( share->canonicalPath().startsWith( QDir( Smb4KSettings::mountPrefix().path() ).canonicalPath() ) ) { QDir dir( share->canonicalPath() ); @@ -1391,9 +1379,7 @@ // If no error occurred, remove the unmounted share from the list and // clean up the mount prefix. Since the unmount process should not // report anything on stdout, we do not need to read it. - if ( qstrncmp( share->canonicalPath(), - QDir( Smb4KSettings::mountPrefix().path() ).canonicalPath().toLocal8Bit(), - QDir( Smb4KSettings::mountPrefix().path() ).canonicalPath().toLocal8Bit().length() ) == 0 ) + if ( share->canonicalPath().startsWith( QDir( Smb4KSettings::mountPrefix().path() ).canonicalPath() ) ) { QDir dir( share->canonicalPath() ); @@ -1550,15 +1536,10 @@ for ( int j = 0; j < inaccessible_shares.size(); ++j ) { - if ( qstrncmp( inaccessible_shares.at( j )->path(), - (Smb4KSettings::mountPrefix().path()+dirs.at( i )).toLocal8Bit(), - (Smb4KSettings::mountPrefix().path()+dirs.at( i )).toLocal8Bit().length() ) == 0 || - qstrncmp( inaccessible_shares.at( j )->canonicalPath(), - (Smb4KSettings::mountPrefix().path()+dirs.at( i )).toLocal8Bit(), - (Smb4KSettings::mountPrefix().path()+dirs.at( i )).toLocal8Bit().length() ) == 0 ) + if ( inaccessible_shares.at( j )->path().startsWith( (Smb4KSettings::mountPrefix().path()+dirs.at( i )) ) || + inaccessible_shares.at( j )->canonicalPath().startsWith( (Smb4KSettings::mountPrefix().path()+dirs.at( i )) ) ) { inaccessible = true; - break; } else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/core/smb4kmounter_p.h new/smb4k-0.10.12/core/smb4kmounter_p.h --- old/smb4k-0.10.10/core/smb4kmounter_p.h 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/core/smb4kmounter_p.h 2011-12-04 09:47:05.000000000 +0100 @@ -82,7 +82,7 @@ struct statvfs vfs; - if ( statvfs( m_share->canonicalPath(), &vfs ) == -1 ) + if ( statvfs( m_share->canonicalPath().toUtf8(), &vfs ) == -1 ) { m_share->setInaccessible( true ); m_share->setFreeDiskSpace( -1 ); @@ -104,7 +104,7 @@ // to use statfs for that. struct statfs fs; - if ( statfs( m_share->canonicalPath(), &fs ) == -1 ) + if ( statfs( m_share->canonicalPath().toUtf8(), &fs ) == -1 ) { m_share->setFileSystem( Smb4KShare::Unknown ); } @@ -142,7 +142,7 @@ { struct stat buf; - if ( lstat( m_share->canonicalPath(), &buf ) == -1 ) + if ( lstat( m_share->canonicalPath().toUtf8(), &buf ) == -1 ) { m_share->setUID( (uid_t)-1 ); m_share->setGID( (gid_t)-1 ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/core/smb4kpreviewer.cpp new/smb4k-0.10.12/core/smb4kpreviewer.cpp --- old/smb4k-0.10.10/core/smb4kpreviewer.cpp 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/core/smb4kpreviewer.cpp 2011-12-04 09:47:05.000000000 +0100 @@ -223,7 +223,7 @@ if ( exitStatus == QProcess::NormalExit ) { // Read from stderr and decide what to do: - QString stderr_output = QString::fromLocal8Bit( m_proc->readAllStandardError(), -1 ).trimmed(); + QString stderr_output = QString::fromUtf8( m_proc->readAllStandardError(), -1 ).trimmed(); if ( !stderr_output.isEmpty() ) { @@ -284,7 +284,7 @@ } // No error occurred. Process the output from stdout: - QStringList list = QString::fromLocal8Bit( m_proc->readAllStandardOutput(), -1 ) + QStringList list = QString::fromUtf8( m_proc->readAllStandardOutput(), -1 ) .split( "\n", QString::SkipEmptyParts ); for ( int i = 0; i < list.size(); ++i ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/core/smb4kprint.cpp new/smb4k-0.10.12/core/smb4kprint.cpp --- old/smb4k-0.10.10/core/smb4kprint.cpp 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/core/smb4kprint.cpp 2011-12-04 09:47:05.000000000 +0100 @@ -143,8 +143,8 @@ { if ( !authInfo.login().isEmpty() ) { - uri = QString( "smb://%1:%2@%3/%4/%5" ).arg( QString::fromLocal8Bit( authInfo.login(), -1 ) ) - .arg( QString::fromLocal8Bit( authInfo.password(), -1 ) ) + uri = QString( "smb://%1:%2@%3/%4/%5" ).arg( authInfo.login() ) + .arg( authInfo.password() ) .arg( m_info.shareItem()->workgroup(), m_info.shareItem()->host(), m_info.shareItem()->name() ); @@ -160,8 +160,8 @@ { if ( !authInfo.login().isEmpty() ) { - uri = QString( "smb://%1:%2@%3/%4" ).arg( QString::fromLocal8Bit( authInfo.login(), -1 ) ) - .arg( QString::fromLocal8Bit( authInfo.password(), -1 ) ) + uri = QString( "smb://%1:%2@%3/%4" ).arg( authInfo.login() ) + .arg( authInfo.password() ) .arg( m_info.shareItem()->host(), m_info.shareItem()->name() ); } @@ -336,7 +336,7 @@ if ( exitStatus == QProcess::NormalExit ) { // Read from stderr and decide what to do: - QString stderr_output = QString::fromLocal8Bit( m_proc->readAllStandardError(), -1 ).trimmed(); + QString stderr_output = QString::fromUtf8( m_proc->readAllStandardError(), -1 ).trimmed(); if ( !stderr_output.isEmpty() ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/core/smb4kscanner.cpp new/smb4k-0.10.12/core/smb4kscanner.cpp --- old/smb4k-0.10.10/core/smb4kscanner.cpp 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/core/smb4kscanner.cpp 2011-12-04 09:47:05.000000000 +0100 @@ -543,7 +543,7 @@ void Smb4KScanner::processWorkgroups() { // Read from stderr and decide what to do: - QString stderr_output = QString::fromLocal8Bit( m_proc->readAllStandardError(), -1 ).trimmed(); + QString stderr_output = QString::fromUtf8( m_proc->readAllStandardError(), -1 ).trimmed(); if ( !stderr_output.isEmpty() ) { @@ -560,7 +560,7 @@ // There was no error. We can proceed with processing the // output from stdout. - QString stdout_output = QString::fromLocal8Bit( m_proc->readAllStandardOutput(), -1 ).trimmed(); + QString stdout_output = QString::fromUtf8( m_proc->readAllStandardOutput(), -1 ).trimmed(); QStringList list = stdout_output.split( "\n", QString::KeepEmptyParts ); QList<Smb4KWorkgroup *> temp_workgroups_list; @@ -850,7 +850,7 @@ void Smb4KScanner::processIPScan() { // Read from stderr and decide what to do: - QString stderr_output = QString::fromLocal8Bit( m_proc->readAllStandardError(), -1 ).trimmed(); + QString stderr_output = QString::fromUtf8( m_proc->readAllStandardError(), -1 ).trimmed(); if ( !stderr_output.isEmpty() ) { @@ -867,7 +867,7 @@ // There was no error. We can proceed with processing the // output from stdout. - QString stdout_output = QString::fromLocal8Bit( m_proc->readAllStandardOutput(), -1 ).trimmed(); + QString stdout_output = QString::fromUtf8( m_proc->readAllStandardOutput(), -1 ).trimmed(); QStringList list = stdout_output.split( "\n", QString::KeepEmptyParts ); QList<Smb4KWorkgroup *> temp_workgroups_list; @@ -1020,7 +1020,7 @@ void Smb4KScanner::processWorkgroupMembers() { // Read from stderr and decide what to do: - QString stderr_output = QString::fromLocal8Bit( m_proc->readAllStandardError(), -1 ).trimmed(); + QString stderr_output = QString::fromUtf8( m_proc->readAllStandardError(), -1 ).trimmed(); if ( !stderr_output.isEmpty() ) { @@ -1073,7 +1073,7 @@ // There was no error. We can proceed with processing the // output from stdout. - QString stdout_output = QString::fromLocal8Bit( m_proc->readAllStandardOutput(), -1 ).trimmed(); + QString stdout_output = QString::fromUtf8( m_proc->readAllStandardOutput(), -1 ).trimmed(); QStringList list = stdout_output.split( "\n", QString::SkipEmptyParts ); if ( Smb4KSettings::lookupDomains() || @@ -1263,7 +1263,7 @@ void Smb4KScanner::processShares() { // Read from stderr and decide what to do: - QString stderr_output = QString::fromLocal8Bit( m_proc->readAllStandardError(), -1 ).trimmed(); + QString stderr_output = QString::fromUtf8( m_proc->readAllStandardError(), -1 ).trimmed(); if ( !stderr_output.isEmpty() ) { @@ -1321,7 +1321,7 @@ // There was no error. We can proceed with processing the // output from stdout. - QString stdout_output = QString::fromLocal8Bit( m_proc->readAllStandardOutput(), -1 ).trimmed(); + QString stdout_output = QString::fromUtf8( m_proc->readAllStandardOutput(), -1 ).trimmed(); QStringList list = stdout_output.split( "\n", QString::SkipEmptyParts ); QList<Smb4KShare *> temp_shares_list; @@ -1535,7 +1535,7 @@ { // Since the information about the server and operating system // is debug information, it will be reported via stderr. - QString stderr_output = QString::fromLocal8Bit( m_proc->readAllStandardError(), -1 ).trimmed(); + QString stderr_output = QString::fromUtf8( m_proc->readAllStandardError(), -1 ).trimmed(); // Get the host. Smb4KHost *host = findHost( m_priv->host().name(), m_priv->host().workgroup() ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/core/smb4ksearch.cpp new/smb4k-0.10.12/core/smb4ksearch.cpp --- old/smb4k-0.10.10/core/smb4ksearch.cpp 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/core/smb4ksearch.cpp 2011-12-04 09:47:05.000000000 +0100 @@ -233,7 +233,7 @@ void Smb4KSearch::slotReadyReadStandardError() { - QString stderr_output = QString::fromLocal8Bit( m_proc->readAllStandardError(), -1 ); + QString stderr_output = QString::fromUtf8( m_proc->readAllStandardError(), -1 ); // Process authentication errors: if ( (stderr_output.contains( "The username or password was not correct." ) || @@ -262,7 +262,7 @@ void Smb4KSearch::slotReadyReadStandardOutput() { - QString stdout_output = QString::fromLocal8Bit( m_proc->readAllStandardOutput(), -1 ); + QString stdout_output = QString::fromUtf8( m_proc->readAllStandardOutput(), -1 ); QStringList output = stdout_output.split( "\n", QString::SkipEmptyParts, Qt::CaseSensitive ); switch ( m_state ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/core/smb4kshare.cpp new/smb4k-0.10.12/core/smb4kshare.cpp --- old/smb4k-0.10.10/core/smb4kshare.cpp 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/core/smb4kshare.cpp 2011-12-04 09:47:05.000000000 +0100 @@ -302,13 +302,13 @@ void Smb4KShare::setPath( const QString &mountpoint ) { - m_path = mountpoint.toLocal8Bit(); + m_path = mountpoint; } -const QByteArray Smb4KShare::canonicalPath() const +const QString Smb4KShare::canonicalPath() const { - return (m_inaccessible ? m_path : QDir( m_path ).canonicalPath().toLocal8Bit()); + return (m_inaccessible ? m_path : QDir( m_path ).canonicalPath()); } @@ -929,7 +929,7 @@ m_user = KUser( getuid() ); m_group = KUserGroup( getgid() ); #ifndef __FreeBSD__ - m_login = QString::fromLocal8Bit( getpwuid( getuid() )->pw_name ); + m_login = QString::fromUtf8( getpwuid( getuid() )->pw_name ); #else m_login = "guest"; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/core/smb4kshare.h new/smb4k-0.10.12/core/smb4kshare.h --- old/smb4k-0.10.10/core/smb4kshare.h 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/core/smb4kshare.h 2011-12-04 09:47:05.000000000 +0100 @@ -243,7 +243,7 @@ * * @returns the path to the mounted share. */ - const QByteArray &path() const { return m_path; } + const QString &path() const { return m_path; } /** * Returns the canonical path to the mounted share. In contrast to the path() @@ -253,7 +253,7 @@ * * @returns the canonical path to the mounted share. */ - const QByteArray canonicalPath() const; + const QString canonicalPath() const; /** * Set @p in to TRUE if the share cannot be accessed by the user. This may be @@ -654,7 +654,7 @@ /** * The path to the mounted share */ - QByteArray m_path; + QString m_path; /** * Determines if the share is inaccessible diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/core/smb4ksudowriterinterface.cpp new/smb4k-0.10.12/core/smb4ksudowriterinterface.cpp --- old/smb4k-0.10.10/core/smb4ksudowriterinterface.cpp 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/core/smb4ksudowriterinterface.cpp 2011-12-04 09:47:05.000000000 +0100 @@ -118,7 +118,7 @@ // smb4k_sudowriter won't generate any output if it successfully could // write to the sudoers file. So, just check stderr for output. - QString stderr_output = QString::fromLocal8Bit( m_proc->readAllStandardError(), -1 ).trimmed(); + QString stderr_output = QString::fromUtf8( m_proc->readAllStandardError(), -1 ).trimmed(); // Only report an error if smb4k_sudowriter complained. // Note: If kdesu is not installed or could not be found, Smb4K won't diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/core/smb4ksynchronizer.cpp new/smb4k-0.10.12/core/smb4ksynchronizer.cpp --- old/smb4k-0.10.10/core/smb4ksynchronizer.cpp 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/core/smb4ksynchronizer.cpp 2011-12-04 09:47:05.000000000 +0100 @@ -400,7 +400,7 @@ void Smb4KSynchronizer::slotReadStandardOutput() { - QStringList stdout_output = QString::fromLocal8Bit( m_proc->readAllStandardOutput(), -1 ).split( "\n", QString::SkipEmptyParts ); + QStringList stdout_output = QString::fromUtf8( m_proc->readAllStandardOutput(), -1 ).split( "\n", QString::SkipEmptyParts ); for ( int i = 0; i < stdout_output.size(); ++i ) { @@ -488,7 +488,7 @@ void Smb4KSynchronizer::slotReadStandardError() { - QString stderr_output = QString::fromLocal8Bit( m_proc->readAllStandardError(), -1 ).trimmed(); + QString stderr_output = QString::fromUtf8( m_proc->readAllStandardError(), -1 ).trimmed(); // Avoid reporting an error if the user killed the process by // calling the abort() function. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/core/smb4kwalletmanager.cpp new/smb4k-0.10.12/core/smb4kwalletmanager.cpp --- old/smb4k-0.10.10/core/smb4kwalletmanager.cpp 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/core/smb4kwalletmanager.cpp 2011-12-04 09:47:05.000000000 +0100 @@ -211,7 +211,7 @@ // Only set the authentication information the map is not empty and if // either the login was not set in authInfo or it is equal to map["Login"]. if ( !map.isEmpty() && - (authInfo->login().isEmpty() || QString::compare( QString::fromLocal8Bit( authInfo->login() ), map["Login"] ) == 0) ) + (authInfo->login().isEmpty() || QString::compare( authInfo->login(), map["Login"] ) == 0) ) { // Do not set the authentication, if the workgroup does not match. if ( map["Workgroup"].isEmpty() || authInfo->workgroupName().isEmpty() || @@ -262,7 +262,7 @@ // Only set the authentication information the map is not empty and if // either the login was not set in authInfo or it is equal to map["Login"]. if ( !map.isEmpty() && - (authInfo->login().isEmpty() || QString::compare( QString::fromLocal8Bit( authInfo->login() ), map["Login"] ) == 0) ) + (authInfo->login().isEmpty() || QString::compare( authInfo->login(), map["Login"] ) == 0) ) { if ( map["Workgroup"].isEmpty() || authInfo->workgroupName().isEmpty() || QString::compare( map["Workgroup"], authInfo->workgroupName().toUpper() ) == 0 ) @@ -527,8 +527,8 @@ } else { - logins.insert( QString::fromLocal8Bit( user_auth_info.login() ), - QString::fromLocal8Bit( user_auth_info.password() ) ); + logins.insert( user_auth_info.login(), + user_auth_info.password() ); } } } @@ -765,7 +765,7 @@ } default: { - password = QString::fromLocal8Bit( proc.readAllStandardOutput(), -1 ).trimmed(); + password = QString::fromUtf8( proc.readAllStandardOutput(), -1 ).trimmed(); break; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/smb4k/browser/CMakeLists.txt new/smb4k-0.10.12/smb4k/browser/CMakeLists.txt --- old/smb4k-0.10.10/smb4k/browser/CMakeLists.txt 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/smb4k/browser/CMakeLists.txt 2011-12-04 09:47:05.000000000 +0100 @@ -10,7 +10,7 @@ smb4knetworkbrowseritem.cpp smb4knetworkbrowsertooltip.cpp ) -kde4_add_plugin(smb4knetworkbrowser WITH_PREFIX ${smb4knetworkbrowser_PART_SRCS}) +kde4_add_plugin(smb4knetworkbrowser ${smb4knetworkbrowser_PART_SRCS}) target_link_libraries(smb4knetworkbrowser ${KDE4_KDECORE_LIBS} smb4kcore smb4kdialogs ${KDE4_KPARTS_LIBS} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/smb4k/browser/smb4knetworkbrowser.cpp new/smb4k-0.10.12/smb4k/browser/smb4knetworkbrowser.cpp --- old/smb4k-0.10.10/smb4k/browser/smb4knetworkbrowser.cpp 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/smb4k/browser/smb4knetworkbrowser.cpp 2011-12-04 09:47:05.000000000 +0100 @@ -70,12 +70,6 @@ header()->setResizeMode( QHeaderView::ResizeToContents ); // Add some connections: - connect( this, SIGNAL( itemExpanded( QTreeWidgetItem * ) ), - this, SLOT( slotItemExpanded( QTreeWidgetItem * ) ) ); - - connect( this, SIGNAL( itemCollapsed( QTreeWidgetItem * ) ), - this, SLOT( slotItemCollapsed( QTreeWidgetItem * ) ) ); - connect( this, SIGNAL( itemExecuted( QTreeWidgetItem *, int ) ), this, SLOT( slotItemExecuted( QTreeWidgetItem *, int ) ) ); @@ -187,18 +181,6 @@ // SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// -void Smb4KNetworkBrowser::slotItemExpanded( QTreeWidgetItem *item ) -{ - item->setSelected( true ); -} - - -void Smb4KNetworkBrowser::slotItemCollapsed( QTreeWidgetItem *item ) -{ - item->setSelected( false ); -} - - void Smb4KNetworkBrowser::slotItemEntered( QTreeWidgetItem *item, int /*column*/ ) { // Comply with KDE's settings. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/smb4k/browser/smb4knetworkbrowser.h new/smb4k-0.10.12/smb4k/browser/smb4knetworkbrowser.h --- old/smb4k-0.10.10/smb4k/browser/smb4knetworkbrowser.h 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/smb4k/browser/smb4knetworkbrowser.h 2011-12-04 09:47:05.000000000 +0100 @@ -141,22 +141,6 @@ void wheelEvent( QWheelEvent *e ); protected slots: - /** - * This slot is called whenever an item is expanded. - * - * @param item The tree widget item that has been - * expanded. - */ - void slotItemExpanded( QTreeWidgetItem *item ); - - /** - * This slot is called whenever an item is collapsed. - * - * @param item The tree widget item that has been - * collapsed. - */ - void slotItemCollapsed( QTreeWidgetItem *item ); - /** * This slot is used to change the cursor over an item if appropriate. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/smb4k/browser/smb4knetworkbrowser_part.cpp new/smb4k-0.10.12/smb4k/browser/smb4knetworkbrowser_part.cpp --- old/smb4k-0.10.10/smb4k/browser/smb4knetworkbrowser_part.cpp 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/smb4k/browser/smb4knetworkbrowser_part.cpp 2011-12-04 09:47:05.000000000 +0100 @@ -62,19 +62,19 @@ using namespace Smb4KGlobal; -typedef KParts::GenericFactory<Smb4KNetworkBrowserPart> Smb4KNetworkBrowserPartFactory; -K_EXPORT_COMPONENT_FACTORY( libsmb4knetworkbrowser, Smb4KNetworkBrowserPartFactory ) +K_PLUGIN_FACTORY( Smb4KNetworkBrowserPartFactory, registerPlugin<Smb4KNetworkBrowserPart>(); ) +K_EXPORT_PLUGIN( Smb4KNetworkBrowserPartFactory( "Smb4KNetworkBrowserPart" ) ); -Smb4KNetworkBrowserPart::Smb4KNetworkBrowserPart( QWidget *parentWidget, QObject *parent, const QStringList &args ) +Smb4KNetworkBrowserPart::Smb4KNetworkBrowserPart( QWidget *parentWidget, QObject *parent, const QList<QVariant> &args ) : KParts::Part( parent ), m_mode( Normal ) { // Parse arguments: for ( int i = 0; i < args.size(); ++i ) { - if ( args.at( i ).startsWith( "konqplugin" ) ) + if ( args.at( i ).toString().startsWith( "konqplugin" ) ) { - if ( QString::compare( args.at( i ).section( "=", 1, 1 ).trimmed(), "\"true\"" ) == 0 ) + if ( QString::compare( args.at( i ).toString().section( "=", 1, 1 ).trimmed(), "\"true\"" ) == 0 ) { m_mode = KonqPlugin; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/smb4k/browser/smb4knetworkbrowser_part.h new/smb4k-0.10.12/smb4k/browser/smb4knetworkbrowser_part.h --- old/smb4k-0.10.10/smb4k/browser/smb4knetworkbrowser_part.h 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/smb4k/browser/smb4knetworkbrowser_part.h 2011-12-04 09:47:05.000000000 +0100 @@ -72,7 +72,7 @@ */ Smb4KNetworkBrowserPart( QWidget *parentWidget = 0, QObject *parent = 0, - const QStringList &args = QStringList() ); + const QList<QVariant> &args = QList<QVariant>() ); /** * The destructor. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/smb4k/configdlg/CMakeLists.txt new/smb4k-0.10.12/smb4k/configdlg/CMakeLists.txt --- old/smb4k-0.10.10/smb4k/configdlg/CMakeLists.txt 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/smb4k/configdlg/CMakeLists.txt 2011-12-04 09:47:05.000000000 +0100 @@ -14,7 +14,7 @@ smb4ksuperuseroptions.cpp smb4kuserinterfaceoptions.cpp ) -kde4_add_plugin(smb4kconfigdialog WITH_PREFIX ${smb4kconfigdialog_LIB_SRCS}) +kde4_add_plugin(smb4kconfigdialog ${smb4kconfigdialog_LIB_SRCS}) target_link_libraries( smb4kconfigdialog ${KDE4_KDECORE_LIBS} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/smb4k/configdlg/smb4kconfigdialog.cpp new/smb4k-0.10.12/smb4k/configdlg/smb4kconfigdialog.cpp --- old/smb4k-0.10.10/smb4k/configdlg/smb4kconfigdialog.cpp 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/smb4k/configdlg/smb4kconfigdialog.cpp 2011-12-04 09:47:05.000000000 +0100 @@ -74,7 +74,8 @@ bool close_dialog = false; -K_EXPORT_COMPONENT_FACTORY( libsmb4kconfigdialog, KGenericFactory<Smb4KConfigDialog> ) +K_PLUGIN_FACTORY( Smb4KConfigDialogFactory, registerPlugin<Smb4KConfigDialog>(); ) +K_EXPORT_PLUGIN( Smb4KConfigDialogFactory( "Smb4KConfigDialog" ) ); Smb4KConfigDialog::Smb4KConfigDialog( QWidget *parent, const char *name, Smb4KSettings *settings ) @@ -84,7 +85,7 @@ } -Smb4KConfigDialog::Smb4KConfigDialog( QWidget *parent, const QStringList &/*args*/ ) +Smb4KConfigDialog::Smb4KConfigDialog( QWidget *parent, const QList<QVariant> &/*args*/ ) : KConfigDialog( parent, "ConfigDialog", Smb4KSettings::self() ) { setupDialog(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/smb4k/configdlg/smb4kconfigdialog.h new/smb4k-0.10.12/smb4k/configdlg/smb4kconfigdialog.h --- old/smb4k-0.10.10/smb4k/configdlg/smb4kconfigdialog.h 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/smb4k/configdlg/smb4kconfigdialog.h 2011-12-04 09:47:05.000000000 +0100 @@ -69,7 +69,7 @@ * * @param args The argument list */ - Smb4KConfigDialog( QWidget *parent, const QStringList &args ); + Smb4KConfigDialog( QWidget *parent, const QList<QVariant> &args ); /** * The destructor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/smb4k/dialogs/smb4ksynchronizationdialog.cpp new/smb4k-0.10.12/smb4k/dialogs/smb4ksynchronizationdialog.cpp --- old/smb4k-0.10.10/smb4k/dialogs/smb4ksynchronizationdialog.cpp 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/smb4k/dialogs/smb4ksynchronizationdialog.cpp 2011-12-04 09:47:05.000000000 +0100 @@ -62,7 +62,7 @@ QLabel *source_label = new QLabel( i18n( "Source:" ), main_widget ); m_source = new KUrlRequester( main_widget ); - m_source->setPath( QString::fromLocal8Bit( m_share->path() )+"/" ); + m_source->setUrl( KUrl( m_share->path()+"/" ) ); m_source->setMode( KFile::Directory | KFile::LocalOnly ); m_source->lineEdit()->setSqueezedTextEnabled( true ); @@ -179,11 +179,11 @@ void Smb4KSynchronizationDialog::slotUser2Clicked() { // Swap URLs. - QString sourceURL = m_source->url().path(); - QString destinationURL = m_destination->url().path(); - - m_source->setPath( destinationURL ); - m_destination->setPath( sourceURL ); + QUrl sourceURL = m_source->url(); + QUrl destinationURL = m_destination->url(); + + m_source->setUrl( destinationURL ); + m_destination->setUrl( sourceURL ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/smb4k/main.cpp new/smb4k-0.10.12/smb4k/main.cpp --- old/smb4k-0.10.10/smb4k/main.cpp 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/smb4k/main.cpp 2011-12-04 09:47:05.000000000 +0100 @@ -51,7 +51,7 @@ I18N_NOOP( "The advanced network neighborhood browser for KDE." ); static const char authors[] = - I18N_NOOP( "(c) 2003-2008, Alexander Reinholdt\n(c) 2004-2007, " + I18N_NOOP( "(c) 2003-2011, Alexander Reinholdt\n(c) 2004-2007, " "Massimo Callegari" ); @@ -65,13 +65,13 @@ KAboutData::License_GPL_V2, ki18n( authors ), KLocalizedString(), - "http://smb4k.berlios.de";, - "smb4k-b...@lists.berlios.de" ); + "http://smb4k.sourceforge.net";, + "smb4k-b...@lists.sourceforge.net" ); // Authors: aboutData.addAuthor( ki18n( "Alexander Reinholdt" ), ki18n( "Developer" ), - "dustpu...@users.berlios.de" ); + "alexander.reinho...@kdemail.net" ); aboutData.addAuthor( ki18n( "Massimo Callegari" ), ki18n( "Developer" ), "massimocalleg...@yahoo.it" ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/smb4k/searchdlg/CMakeLists.txt new/smb4k-0.10.12/smb4k/searchdlg/CMakeLists.txt --- old/smb4k-0.10.10/smb4k/searchdlg/CMakeLists.txt 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/smb4k/searchdlg/CMakeLists.txt 2011-12-04 09:47:05.000000000 +0100 @@ -6,7 +6,7 @@ set(smb4ksearchdialog_PART_SRCS smb4ksearchdialog.cpp smb4ksearchdialog_part.cpp smb4ksearchdialogitem.cpp ) -kde4_add_plugin(smb4ksearchdialog WITH_PREFIX ${smb4ksearchdialog_PART_SRCS}) +kde4_add_plugin(smb4ksearchdialog ${smb4ksearchdialog_PART_SRCS}) target_link_libraries(smb4ksearchdialog ${KDE4_KDECORE_LIBS} smb4kcore ${KDE4_KPARTS_LIBS} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/smb4k/searchdlg/smb4ksearchdialog_part.cpp new/smb4k-0.10.12/smb4k/searchdlg/smb4ksearchdialog_part.cpp --- old/smb4k-0.10.10/smb4k/searchdlg/smb4ksearchdialog_part.cpp 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/smb4k/searchdlg/smb4ksearchdialog_part.cpp 2011-12-04 09:47:05.000000000 +0100 @@ -50,10 +50,10 @@ using namespace Smb4KGlobal; -typedef KParts::GenericFactory<Smb4KSearchDialogPart> Smb4KSearchDialogPartFactory; -K_EXPORT_COMPONENT_FACTORY( libsmb4ksearchdialog, Smb4KSearchDialogPartFactory ) +K_PLUGIN_FACTORY( Smb4KSearchDialogPartFactory, registerPlugin<Smb4KSearchDialogPart>(); ) +K_EXPORT_PLUGIN( Smb4KSearchDialogPartFactory( "Smb4KSearchDialogPart" ) ); -Smb4KSearchDialogPart::Smb4KSearchDialogPart( QWidget *parentWidget, QObject *parent, const QStringList & /*args*/ ) +Smb4KSearchDialogPart::Smb4KSearchDialogPart( QWidget *parentWidget, QObject *parent, const QList<QVariant> & /*args*/ ) : KParts::Part( parent ) { // Set the XML file: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/smb4k/searchdlg/smb4ksearchdialog_part.h new/smb4k-0.10.12/smb4k/searchdlg/smb4ksearchdialog_part.h --- old/smb4k-0.10.10/smb4k/searchdlg/smb4ksearchdialog_part.h 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/smb4k/searchdlg/smb4ksearchdialog_part.h 2011-12-04 09:47:05.000000000 +0100 @@ -65,7 +65,7 @@ */ Smb4KSearchDialogPart( QWidget *parentWidget = 0, QObject *parent = 0, - const QStringList &args = QStringList() ); + const QList<QVariant> &args = QList<QVariant>() ); /** * The destructor. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/smb4k/sharesview/CMakeLists.txt new/smb4k-0.10.12/smb4k/sharesview/CMakeLists.txt --- old/smb4k-0.10.10/smb4k/sharesview/CMakeLists.txt 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/smb4k/sharesview/CMakeLists.txt 2011-12-04 09:47:05.000000000 +0100 @@ -13,7 +13,7 @@ smb4ksharesviewtooltip.cpp smb4ksharesviewitemdata.cpp ) -kde4_add_plugin( smb4ksharesview WITH_PREFIX ${smb4ksharesview_PART_SRCS}) +kde4_add_plugin( smb4ksharesview ${smb4ksharesview_PART_SRCS}) target_link_libraries( smb4ksharesview ${KDE4_KDECORE_LIBS} smb4kdialogs smb4kcore ${KDE4_KPARTS_LIBS} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/smb4k/sharesview/smb4ksharesview_part.cpp new/smb4k-0.10.12/smb4k/sharesview/smb4ksharesview_part.cpp --- old/smb4k-0.10.10/smb4k/sharesview/smb4ksharesview_part.cpp 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/smb4k/sharesview/smb4ksharesview_part.cpp 2011-12-04 09:47:05.000000000 +0100 @@ -53,19 +53,19 @@ using namespace Smb4KGlobal; -typedef KParts::GenericFactory<Smb4KSharesViewPart> Smb4KSharesViewPartFactory; -K_EXPORT_COMPONENT_FACTORY( libsmb4ksharesview, Smb4KSharesViewPartFactory ) +K_PLUGIN_FACTORY( Smb4KSharesViewPartFactory, registerPlugin<Smb4KSharesViewPart>(); ) +K_EXPORT_PLUGIN( Smb4KSharesViewPartFactory( "Smb4KSharesViewPart" ) ); -Smb4KSharesViewPart::Smb4KSharesViewPart( QWidget *parentWidget, QObject *parent, const QStringList &args ) +Smb4KSharesViewPart::Smb4KSharesViewPart( QWidget *parentWidget, QObject *parent, const QList<QVariant> &args ) : KParts::Part( parent ), m_mode( IconMode ) { // Parse the arguments. for ( int i = 0; i < args.size(); ++i ) { - if ( args.at( i ).startsWith( "viewmode" ) ) + if ( args.at( i ).toString().startsWith( "viewmode" ) ) { - if ( QString::compare( args.at( i ).section( "=", 1, 1 ).trimmed(), "list" ) == 0 ) + if ( QString::compare( args.at( i ).toString().section( "=", 1, 1 ).trimmed(), "list" ) == 0 ) { m_mode = ListMode; } @@ -953,7 +953,7 @@ { item = static_cast<Smb4KSharesIconViewItem *>( m_icon_view->item( i ) ); - Smb4KShare *share = findShareByPath( item->itemData()->share()->path() ); + Smb4KShare *share = findShareByPath( item->itemData()->share()->path().toUtf8() ); if ( !share || (share->isForeign() && !Smb4KSettings::showAllShares()) ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/smb4k/sharesview/smb4ksharesview_part.h new/smb4k-0.10.12/smb4k/sharesview/smb4ksharesview_part.h --- old/smb4k-0.10.10/smb4k/sharesview/smb4ksharesview_part.h 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/smb4k/sharesview/smb4ksharesview_part.h 2011-12-04 09:47:05.000000000 +0100 @@ -66,7 +66,7 @@ */ Smb4KSharesViewPart( QWidget *parentWidget = 0, QObject *parent = 0, - const QStringList &args = QStringList() ); + const QList<QVariant> &args = QList<QVariant>() ); /** * The destructor. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/smb4k/smb4kmainwindow.cpp new/smb4k-0.10.12/smb4k/smb4kmainwindow.cpp --- old/smb4k-0.10.10/smb4k/smb4kmainwindow.cpp 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/smb4k/smb4kmainwindow.cpp 2011-12-04 09:47:05.000000000 +0100 @@ -183,7 +183,7 @@ QDockWidget *shares_dock = NULL; // Load the network browser. - KPluginLoader browser_loader( "libsmb4knetworkbrowser" ); + KPluginLoader browser_loader( "smb4knetworkbrowser" ); KPluginFactory *browser_factory = browser_loader.factory(); if ( browser_factory ) @@ -224,7 +224,7 @@ } // Load the search dialog. - KPluginLoader search_loader( "libsmb4ksearchdialog" ); + KPluginLoader search_loader( "smb4ksearchdialog" ); KPluginFactory *search_factory = search_loader.factory(); if ( search_factory ) @@ -264,7 +264,7 @@ return; } - KPluginLoader shares_loader( "libsmb4ksharesview" ); + KPluginLoader shares_loader( "smb4ksharesview" ); KPluginFactory *shares_factory = shares_loader.factory(); if ( shares_factory ) @@ -372,7 +372,15 @@ QList<QAction *> bookmark_actions; bookmark_actions.append( edit_bookmarks ); - bookmark_actions.append( m_browser_part->actionCollection()->action( "bookmark_action" ) ); + + if ( m_browser_part ) + { + bookmark_actions.append( m_browser_part->actionCollection()->action( "bookmark_action" ) ); + } + else + { + // Do nothing + } bookmark_actions.append( separator ); plugActionList( "bookmark_actions", bookmark_actions ); @@ -521,6 +529,13 @@ connect( dlg, SIGNAL( settingsChanged( const QString & ) ), this, SLOT( slotSettingsChanged( const QString & ) ) ); + // Same procedure for the system tray widget + disconnect( dlg, SIGNAL( settingsChanged( const QString & ) ), + m_system_tray_widget, SLOT( slotSettingsChanged( const QString & ) ) ); + + connect( dlg, SIGNAL( settingsChanged( const QString & ) ), + m_system_tray_widget, SLOT( slotSettingsChanged( const QString & ) ) ); + return; } else @@ -529,7 +544,7 @@ } // Load the configuration dialog: - KPluginLoader loader( "libsmb4kconfigdialog" ); + KPluginLoader loader( "smb4kconfigdialog" ); KPluginFactory *config_factory = loader.factory(); if ( config_factory ) @@ -543,6 +558,9 @@ connect( dlg, SIGNAL( settingsChanged( const QString & ) ), this, SLOT( slotSettingsChanged( const QString & ) ) ); + connect( dlg, SIGNAL( settingsChanged( const QString & ) ), + m_system_tray_widget, SLOT( slotSettingsChanged( const QString & ) ) ); + dlg->show(); } else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/smb4k/smb4ksystemtray.cpp new/smb4k-0.10.12/smb4k/smb4ksystemtray.cpp --- old/smb4k-0.10.10/smb4k/smb4ksystemtray.cpp 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/smb4k/smb4ksystemtray.cpp 2011-12-04 09:47:05.000000000 +0100 @@ -216,7 +216,7 @@ } // Load the configuration dialog: - KPluginLoader loader( "libsmb4kconfigdialog" ); + KPluginLoader loader( "smb4kconfigdialog" ); KPluginFactory *config_factory = loader.factory(); if ( config_factory ) @@ -586,15 +586,13 @@ // otherwise it is the share name. if ( Smb4KSettings::showMountPoint() ) { - shares_map.insert( QString::fromLocal8Bit( shares_list->at( i )->canonicalPath() ), - *shares_list->at( i ) ); + shares_map.insert( shares_list->at( i )->canonicalPath(), *shares_list->at( i ) ); continue; } else { - shares_map.insert( shares_list->at( i )->unc(), - *shares_list->at( i ) ); + shares_map.insert( shares_list->at( i )->unc(), *shares_list->at( i ) ); continue; } @@ -644,7 +642,7 @@ // Disable actions that should not be performed on an inaccessible // share: QAction *synchronize = actionCollection()->action( QVariant( "st_synchronize_"+it.value().canonicalPath() ).toString() ); - + if ( synchronize ) { synchronize->setEnabled( false ); @@ -653,9 +651,9 @@ { // Do nothing } - + QAction *konsole = actionCollection()->action( QVariant( "st_konsole_"+it.value().canonicalPath() ).toString() ); - + if ( konsole ) { konsole->setEnabled( false ); @@ -664,9 +662,9 @@ { // Do nothing } - + QAction *filemanager = actionCollection()->action( QVariant( "st_filemanager_"+it.value().canonicalPath() ).toString() ); - + if ( filemanager ) { filemanager->setEnabled( false ); @@ -702,7 +700,7 @@ // If we have a foreign share, check if we have to enable/disable the // unmount actions. QAction *unmount = actionCollection()->action( QVariant( "st_unmount_"+it.value().canonicalPath() ).toString() ); - + if ( unmount ) { unmount->setEnabled( !(it.value().isForeign() && !Smb4KSettings::unmountForeignShares()) ); @@ -711,10 +709,10 @@ { // Do nothing } - + #ifdef __linux__ QAction *force = actionCollection()->action( QVariant( "st_force_"+it.value().canonicalPath() ).toString() ); - + if ( force ) { force->setEnabled( !(it.value().isForeign() && !Smb4KSettings::unmountForeignShares()) && diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/smb4k/smb4ksystemtray.h new/smb4k-0.10.12/smb4k/smb4ksystemtray.h --- old/smb4k-0.10.10/smb4k/smb4ksystemtray.h 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/smb4k/smb4ksystemtray.h 2011-12-04 09:47:05.000000000 +0100 @@ -41,6 +41,8 @@ class Smb4KSystemTray : public KSystemTrayIcon { Q_OBJECT + + friend class Smb4KMainWindow; public: /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/smb4k_010.kdev4 new/smb4k-0.10.12/smb4k_010.kdev4 --- old/smb4k-0.10.10/smb4k_010.kdev4 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/smb4k_010.kdev4 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -[Project] -Manager=KDevCMakeManager -Name=Smb4K 0.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/svn-commit.tmp new/smb4k-0.10.12/svn-commit.tmp --- old/smb4k-0.10.10/svn-commit.tmp 1970-01-01 01:00:00.000000000 +0100 +++ new/smb4k-0.10.12/svn-commit.tmp 2011-12-04 09:47:05.000000000 +0100 @@ -0,0 +1,6 @@ +- Updated ChangeLog. +- Modified addresses. +-- Diese und die folgenden Zeilen werden ignoriert -- + +M smb4k/main.cpp +M ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.10/utilities/smb4k_sudowriter.cpp new/smb4k-0.10.12/utilities/smb4k_sudowriter.cpp --- old/smb4k-0.10.10/utilities/smb4k_sudowriter.cpp 2011-03-08 13:05:27.000000000 +0100 +++ new/smb4k-0.10.12/utilities/smb4k_sudowriter.cpp 2011-12-04 09:47:05.000000000 +0100 @@ -716,7 +716,7 @@ case 2: { cerr << argv[0] << ": " << I18N_NOOP( "Wrong format of Smb4K section in sudoers file detected." ) << endl; - cerr << argv[0] << ": " << I18N_NOOP( "Please fix this manually." ) << endl; + cerr << argv[0] << ": " << I18N_NOOP( "Please correct this manually." ) << endl; cerr << argv[0] << ": " << I18N_NOOP( "Aborting." ) << endl; removeLockFile( &lock_file ); exit( EXIT_FAILURE ); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
