[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-1/amarok/src
From:       Mark Kretschmann <markey () web ! de>
Date:       2005-03-20 17:50:34
Message-ID: 20050320175034.47DE016F7D () office ! kde ! org
[Download RAW message or body]

CVS commit by markey: 

More const correctness.

CCMAIL: amarok-devel@lists.sf.net


  M +11 -12    scriptmanager.cpp   1.62


--- kdeextragear-1/amarok/src/scriptmanager.cpp  #1.61:1.62
@@ -196,5 +196,5 @@ ScriptManager::slotInstallScript()
 
     QString destination = amaroK::saveLocation( "scripts/" );
-    const KArchiveDirectory* archiveDir = archive.directory();
+    const KArchiveDirectory* const archiveDir = archive.directory();
 
     // Prevent installing a script that's already installed
@@ -227,13 +227,13 @@ void
 ScriptManager::recurseInstall( const KArchiveDirectory* archiveDir, const QString& \
destination )  {
-    QStringList entries = archiveDir->entries();
+    const QStringList entries = archiveDir->entries();
 
-    QStringList::Iterator it;
+    QStringList::ConstIterator it;
     for ( it = entries.begin(); it != entries.end(); ++it ) {
         const QString entry = *it;
-        const KArchiveEntry* archEntry = archiveDir->entry( entry );
+        const KArchiveEntry* const archEntry = archiveDir->entry( entry );
 
         if ( archEntry->isDirectory() ) {
-            KArchiveDirectory* dir = (KArchiveDirectory*) archEntry;
+            KArchiveDirectory* const dir = (KArchiveDirectory*) archEntry;
             recurseInstall( dir, destination + entry + "/" );
         }
@@ -263,5 +263,5 @@ ScriptManager::slotUninstallScript()
 
     // Delete directory recursively
-    KURL url = KURL::fromPathOrURL( directory );
+    const KURL url = KURL::fromPathOrURL( directory );
     if ( !KIO::NetAccess::del( url, 0 ) ) {
         KMessageBox::sorry( 0, i18n( "<p>Could not uninstall this script.</p><p>The \
ScriptManager can only uninstall scripts which have been installed as packages.</p>" \
) ); @@ -303,8 +303,8 @@ ScriptManager::slotRunScript()
     DEBUG_BLOCK
 
-    QListViewItem* li = m_base->listView->currentItem();
+    QListViewItem* const li = m_base->listView->currentItem();
     const QString name = li->text( 0 );
 
-    KURL url = m_scripts[name].url;
+    const KURL url = m_scripts[name].url;
     KProcIO* script = new KProcIO();
     script->setComm( KProcess::Stdin );
@@ -334,5 +334,5 @@ ScriptManager::slotStopScript()
     DEBUG_BLOCK
 
-    QListViewItem* li = m_base->listView->currentItem();
+    QListViewItem* const li = m_base->listView->currentItem();
     const QString name = li->text( 0 );
 
@@ -425,5 +425,5 @@ ScriptManager::notifyScripts( const QStr
     ScriptMap::Iterator it;
     for ( it = m_scripts.begin(); it != m_scripts.end(); ++it ) {
-        KProcIO* proc = it.data().process;
+        KProcIO* const proc = it.data().process;
         if ( proc ) proc->writeStdin( message );
     }
@@ -437,6 +437,5 @@ ScriptManager::loadScript( const QString
 
     if ( !path.isEmpty() ) {
-        KURL url;
-        url.setPath( path );
+        const KURL url = KURL::fromPathOrURL( path );
 
         KListViewItem* li = new KListViewItem( m_base->listView, url.fileName() );


[prev in list] [next in list] [prev in thread] [next in thread]