From 598b724c4bad28b74bf4b86ceb2d478b113168e6 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 6 Sep 2015 14:39:32 +0300 Subject: [PATCH] generic: misc cleanups --- drkonqi/parser/backtraceparser.cpp | 5 ++-- drkonqi/parser/backtraceparsergdb.cpp | 22 ++++++++--------- kioclient/kioclient.cpp | 6 ++--- kioslave/CMakeLists.txt | 44 ++++++++++++++++++---------------- kscreensaver/kpartsaver/kpartsaver.cpp | 2 +- kscreensaver/libkscreensaver/main.cpp | 2 +- libs/kephal/CMakeLists.txt | 4 +++- 7 files changed, 43 insertions(+), 42 deletions(-) diff --git a/drkonqi/parser/backtraceparser.cpp b/drkonqi/parser/backtraceparser.cpp index e99d95a7..941d164b 100644 --- a/drkonqi/parser/backtraceparser.cpp +++ b/drkonqi/parser/backtraceparser.cpp @@ -47,9 +47,8 @@ QString BacktraceParser::parsedBacktrace() const QString result; if (d) { - QList::const_iterator i; - for (i = d->m_linesList.constBegin(); i != d->m_linesList.constEnd(); ++i) { - result += i->toString(); + foreach(const BacktraceLine i, d->m_linesList) { + result += i.toString(); } } return result; diff --git a/drkonqi/parser/backtraceparsergdb.cpp b/drkonqi/parser/backtraceparsergdb.cpp index 31f6ce73..450b3b7a 100644 --- a/drkonqi/parser/backtraceparsergdb.cpp +++ b/drkonqi/parser/backtraceparsergdb.cpp @@ -251,17 +251,16 @@ QString BacktraceParserGdb::parsedBacktrace() const QString result; if (d) { - QList::const_iterator i; - for (i = d->m_linesList.constBegin(); i != d->m_linesList.constEnd(); ++i) { + foreach(const BacktraceLine i, d->m_linesList) { //if there is only one thread, we can omit the thread indicator, //the thread header and all the empty lines. - if (d->m_threadsCount == 1 && ((*i).type() == BacktraceLine::ThreadIndicator - || (*i).type() == BacktraceLine::ThreadStart - || (*i).type() == BacktraceLine::EmptyLine)) + if (d->m_threadsCount == 1 && (i.type() == BacktraceLine::ThreadIndicator + || i.type() == BacktraceLine::ThreadStart + || i.type() == BacktraceLine::EmptyLine)) { continue; } - result += i->toString(); + result += i.toString(); } } return result; @@ -273,17 +272,16 @@ QList BacktraceParserGdb::parsedBacktraceLines() const QList result; if (d) { - QList::const_iterator i; - for (i = d->m_linesList.constBegin(); i != d->m_linesList.constEnd(); ++i) { + foreach(const BacktraceLine i, d->m_linesList) { //if there is only one thread, we can omit the thread indicator, //the thread header and all the empty lines. - if (d->m_threadsCount == 1 && ((*i).type() == BacktraceLine::ThreadIndicator - || (*i).type() == BacktraceLine::ThreadStart - || (*i).type() == BacktraceLine::EmptyLine)) + if (d->m_threadsCount == 1 && (i.type() == BacktraceLine::ThreadIndicator + || i.type() == BacktraceLine::ThreadStart + || i.type() == BacktraceLine::EmptyLine)) { continue; } - result.append(*i); + result.append(i); } } return result; diff --git a/kioclient/kioclient.cpp b/kioclient/kioclient.cpp index 39d8be41..e626e631 100644 --- a/kioclient/kioclient.cpp +++ b/kioclient/kioclient.cpp @@ -210,11 +210,9 @@ bool ClientApp::doCopy( int firstArg ) void ClientApp::slotEntries(KIO::Job* job, const KIO::UDSEntryList& list) { KUrl url = static_cast( job )->url(); - KIO::UDSEntryList::ConstIterator it=list.begin(); - for (; it != list.end(); ++it) { + foreach(const KIO::UDSEntry it, list) { // For each file... - QString name = (*it).stringValue( KIO::UDSEntry::UDS_NAME ); - std::cout << qPrintable(name) << std::endl; + std::cout << qPrintable(it.stringValue( KIO::UDSEntry::UDS_NAME )) << std::endl; } } diff --git a/kioslave/CMakeLists.txt b/kioslave/CMakeLists.txt index 6d2dd341..a5780b71 100644 --- a/kioslave/CMakeLists.txt +++ b/kioslave/CMakeLists.txt @@ -3,25 +3,28 @@ set(SAMBA_REQUIRE_SMBC_SET_CONTEXT TRUE) set(SAMBA_REQUIRE_SMBC_OPTION_SET TRUE) macro_optional_find_package(Samba) -set_package_properties(Samba PROPERTIES DESCRIPTION "the SMB client library, a version with smbc_set_context() and smbc_option_set()" - URL "http://www.samba.org" - TYPE OPTIONAL - PURPOSE "Needed to build the SMB kioslave" - ) +set_package_properties(Samba PROPERTIES + DESCRIPTION "the SMB client library, a version with smbc_set_context() and smbc_option_set()" + URL "http://www.samba.org" + TYPE OPTIONAL + PURPOSE "Needed to build the SMB kioslave" +) macro_optional_find_package(LibSSH 0.6.0) -set_package_properties(LibSSH PROPERTIES DESCRIPTION "the SSH library with SFTP support" - URL "http://www.libssh.org/" - TYPE OPTIONAL - PURPOSE "Needed to build the SFTP kioslave" - ) +set_package_properties(LibSSH PROPERTIES + DESCRIPTION "the SSH library with SFTP support" + URL "http://www.libssh.org/" + TYPE OPTIONAL + PURPOSE "Needed to build the SFTP kioslave" +) macro_optional_find_package(Mtp) -set_package_properties(Mtp PROPERTIES DESCRIPTION "the library implementation of the Media Transfer Protocol" - URL "http://libmtp.sourceforge.net/" - TYPE OPTIONAL - PURPOSE "Needed to build the MTP kioslave" - ) +set_package_properties(Mtp PROPERTIES + DESCRIPTION "the library implementation of the Media Transfer Protocol" + URL "http://libmtp.sourceforge.net/" + TYPE OPTIONAL + PURPOSE "Needed to build the MTP kioslave" +) add_subdirectory( about ) add_subdirectory( bookmarks ) @@ -42,20 +45,21 @@ add_subdirectory( thumbnail ) add_subdirectory( docfilter ) if (LIBSSH_FOUND) add_subdirectory(sftp) -endif (LIBSSH_FOUND) +endif() if (MTP_FOUND) add_subdirectory(mtp) -endif (MTP_FOUND) +endif() add_subdirectory( floppy ) add_subdirectory( finger ) check_include_files(rpc/rpc.h HAVE_RPC_RPC_H) add_feature_info("NFS kioslave" HAVE_RPC_RPC_H "The RPC library is needed to build the NFS kioslave") if(HAVE_RPC_RPC_H) - add_subdirectory( nfs ) -endif(HAVE_RPC_RPC_H) + add_subdirectory(nfs) +endif() if(SAMBA_FOUND) add_subdirectory(smb) -endif(SAMBA_FOUND) +endif() +# add_subdirectory(audiocd) diff --git a/kscreensaver/kpartsaver/kpartsaver.cpp b/kscreensaver/kpartsaver/kpartsaver.cpp index dd205554..7e2d3bc2 100644 --- a/kscreensaver/kpartsaver/kpartsaver.cpp +++ b/kscreensaver/kpartsaver/kpartsaver.cpp @@ -176,7 +176,7 @@ bool KPartSaver::openUrl( const KUrl &url ) closeUrl(); // find mime type - QString mime = KMimeType::findByUrl( url )->name(); + const QString mime = KMimeType::findByUrl( url )->name(); // load part m_part = KMimeTypeTrader::createPartInstanceFromQuery( diff --git a/kscreensaver/libkscreensaver/main.cpp b/kscreensaver/libkscreensaver/main.cpp index 0dc5914a..27c17142 100644 --- a/kscreensaver/libkscreensaver/main.cpp +++ b/kscreensaver/libkscreensaver/main.cpp @@ -192,7 +192,7 @@ int kScreenSaverMain( int argc, char** argv, KScreenSaverInterface& screenSaverI #ifdef Q_WS_X11 //FIXME if (args->isSet("root")) { - QX11Info inf; + QX11Info inf; saveWin = RootWindow(QX11Info::display(), inf.screen()); } #endif diff --git a/libs/kephal/CMakeLists.txt b/libs/kephal/CMakeLists.txt index 2232e2c7..e23c302a 100644 --- a/libs/kephal/CMakeLists.txt +++ b/libs/kephal/CMakeLists.txt @@ -1,5 +1,7 @@ PROJECT (kephal) ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(service) -ADD_SUBDIRECTORY(tests) +IF(ENABLE_TESTING) + ADD_SUBDIRECTORY(tests) +ENDIF() -- 2.11.0