From c69fc1366b24491a34163c08d9f4e89014e1d905 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 6 Sep 2015 02:42:53 +0000 Subject: [PATCH] ktradeclient: minor code shrink --- CMakeLists.txt | 4 +--- kcheckpass/CMakeLists.txt | 2 -- ktraderclient/ktraderclient.cpp | 15 +++++---------- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7bf7a10c..6d667829 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -251,9 +251,7 @@ macro_optional_add_subdirectory(kdontchangethehostname) macro_optional_add_subdirectory(kglobalaccel) macro_optional_add_subdirectory(ktimezoned) # Command-line tools (e.g. for shell scripts) -if ( UNIX ) - macro_optional_add_subdirectory(kdeeject) -endif ( UNIX ) +macro_optional_add_subdirectory(kdeeject) macro_optional_add_subdirectory(kfile) macro_optional_add_subdirectory(kiconfinder) macro_optional_add_subdirectory(kioclient) diff --git a/kcheckpass/CMakeLists.txt b/kcheckpass/CMakeLists.txt index 5d664224..5e864b99 100644 --- a/kcheckpass/CMakeLists.txt +++ b/kcheckpass/CMakeLists.txt @@ -27,5 +27,3 @@ install(CODE " set(KCP_PATH \"\$ENV{DESTDIR}${LIBEXEC_INSTALL_DIR}/kcheckpass\") EXECUTE_PROCESS(COMMAND sh -c \"chown root '\${KCP_PATH}' && chmod +s '\${KCP_PATH}'\") ") - -#EXTRA_DIST = README diff --git a/ktraderclient/ktraderclient.cpp b/ktraderclient/ktraderclient.cpp index 8a85e209..698b2730 100644 --- a/ktraderclient/ktraderclient.cpp +++ b/ktraderclient/ktraderclient.cpp @@ -70,25 +70,20 @@ int main( int argc, char **argv ) printf("got %d offers.\n", offers.count()); int i = 0; - KService::List::ConstIterator it = offers.constBegin(); - const KService::List::ConstIterator end = offers.constEnd(); - for (; it != end; ++it, ++i ) + foreach(const KSharedPtr it, offers) { printf("---- Offer %d ----\n", i); - QStringList props = (*it)->propertyNames(); - QStringList::ConstIterator propIt = props.constBegin(); - QStringList::ConstIterator propEnd = props.constEnd(); - for (; propIt != propEnd; ++propIt ) + foreach(const QString propIt , (it)->propertyNames() ) { - QVariant prop = (*it)->property( *propIt ); + QVariant prop = (it)->property( propIt ); if ( !prop.isValid() ) { - printf("Invalid property %s\n", (*propIt).toLocal8Bit().data()); + printf("Invalid property %s\n", (propIt).toLocal8Bit().data()); continue; } - QString outp = *propIt; + QString outp = propIt; outp += " : '"; switch ( prop.type() ) -- 2.11.0