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

List:       kde-commits
Subject:    KDE/kdeedu/marble
From:       Inge Wallin <inge () lysator ! liu ! se>
Date:       2008-02-24 14:36:11
Message-ID: 1203863771.431398.29777.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 778750 by ingwa:

Krazy fixes

 M  +11 -3     ChangeLog  
 M  +1 -1      src/lib/DiscCache.cpp  
 M  +2 -2      src/lib/FileStoragePolicy.cpp  
 M  +2 -2      src/lib/MapTheme.cpp  
 M  +2 -2      src/lib/TinyWebBrowser.cpp  
 M  +6 -6      src/lib/geoscene/data/GeoSceneMapTheme.cpp  


--- trunk/KDE/kdeedu/marble/ChangeLog #778749:778750
@@ -1,5 +1,15 @@
-2008-02-17  Inge Wallin  <ingwa@c83-252-220-112.bredband.comhem.se>
+2008-02-24  Inge Wallin  <inge@lysator.liu.se>
 
+	Krazy fixes:
+	* src/lib/MapTheme.cpp,
+	* src/lib/TinyWebBrowser.cpp,
+	* src/lib/DiscCache.cpp,
+	* src/lib/FileStoragePolicy.cpp,
+	* src/lib/geoscene/data/GeoSceneMapTheme.cpp: 
+	  Check for single char QStrings better written as a QChar
+
+2008-02-17  Inge Wallin  <inge@lysator.liu.se>
+
 	Move current projection to ViewportParams from MarbleMap.
 	* src/lib/MarbleMap.cpp (MarbleMapPrivate): Remove all projections 
 	(construct): Don't init.
@@ -10,8 +20,6 @@
 	(setProjection): initialize m_currentProjection
 	(s_*Projection): new static members
 	
-2008-02-17  Inge Wallin  <inge@lysator.liu.se>
-
 	Follow the coding standards
 	* src/lib/PlaceMarkLayout.cpp: cleaning
 
--- trunk/KDE/kdeedu/marble/src/lib/DiscCache.cpp #778749:778750
@@ -188,7 +188,7 @@
     QString fileName( key );
     fileName.replace( "/", "_" );
 
-    return m_CacheDirectory + "/" + fileName;
+    return m_CacheDirectory + '/' + fileName;
 }
 
 void DiscCache::cleanup()
--- trunk/KDE/kdeedu/marble/src/lib/FileStoragePolicy.cpp #778749:778750
@@ -32,14 +32,14 @@
 
 bool FileStoragePolicy::fileExists( const QString &fileName ) const
 {
-    const QString fullName( m_dataDirectory + "/" + fileName );
+    const QString fullName( m_dataDirectory + '/' + fileName );
 
     return QFile::exists( fullName );
 }
 
 bool FileStoragePolicy::updateFile( const QString &fileName, const QByteArray &data )
 {
-    const QString fullName( m_dataDirectory + "/" + fileName );
+    const QString fullName( m_dataDirectory + '/' + fileName );
 
 
     // Create directory if it doesn't exist yet...
--- trunk/KDE/kdeedu/marble/src/lib/MapTheme.cpp #778749:778750
@@ -420,7 +420,7 @@
                                      QDir::NoDotAndDotDot );
         for ( int theme = 0; theme < thememappaths.size(); ++theme ) {
             localmapdirs << MarbleDirs::localPath() + "/maps/" +
-            localmappaths.at( planet ) + "/" + 
+            localmappaths.at( planet ) + '/' + 
             thememappaths.at( theme );
         }
     }
@@ -436,7 +436,7 @@
                                      QDir::NoDotAndDotDot );
         for ( int theme = 0; theme < thememappaths.size(); ++theme ) {
             sysmapdirs << MarbleDirs::systemPath() + "/maps/" +
-            sysmappaths.at( planet ) + "/" + 
+            sysmappaths.at( planet ) + '/' + 
             thememappaths.at( theme );
         }
     }
--- trunk/KDE/kdeedu/marble/src/lib/TinyWebBrowser.cpp #778749:778750
@@ -147,10 +147,10 @@
     // We do the percent encoding later...
     QString urlString = QUrl::fromPercentEncoding( url.toString().toLatin1() );
 
-    if ( urlString.startsWith( "#" ) ) { // Handle anchors
+    if ( urlString.startsWith( '#' ) ) { // Handle anchors
         scrollToAnchor( urlString.mid( 1 ) );
         return;
-    } else if ( urlString.startsWith( "/" ) )
+    } else if ( urlString.startsWith( '/' ) )
         urlString = urlString.mid( 1 ); // Handle local urls
 
     QString server, relativeUrl;
--- trunk/KDE/kdeedu/marble/src/lib/geoscene/data/GeoSceneMapTheme.cpp #778749:778750
@@ -85,9 +85,9 @@
                                      QDir::NoSymLinks |
                                      QDir::NoDotAndDotDot );
         for ( int theme = 0; theme < thememappaths.size(); ++theme ) {
-            localmapdirs << MarbleDirs::localPath() + "/maps/" +
-            localmappaths.at( planet ) + "/" + 
-            thememappaths.at( theme );
+            localmapdirs << ( MarbleDirs::localPath() + "/maps/" 
+                              + localmappaths.at( planet ) + '/'
+                              + thememappaths.at( theme ) );
         }
     }
 
@@ -101,9 +101,9 @@
                                      QDir::NoSymLinks |
                                      QDir::NoDotAndDotDot );
         for ( int theme = 0; theme < thememappaths.size(); ++theme ) {
-            sysmapdirs << MarbleDirs::systemPath() + "/maps/" +
-            sysmappaths.at( planet ) + "/" + 
-            thememappaths.at( theme );
+            sysmapdirs << ( MarbleDirs::systemPath() + "/maps/" 
+                            + sysmappaths.at( planet ) + '/' 
+                            + thememappaths.at( theme ) );
         }
     }
         
[prev in list] [next in list] [prev in thread] [next in thread]