[Marble-commits] KDE/kdeedu/marble/src/lib (silent)

[Dennis Nienhüser]

SVN commit 1117322 by nienhueser:

SVN_SILENT krazy2 fixes

 M  +10 -10    DataMigration.cpp  
 M  +1 -1      MarbleMap.h  
 M  +1 -1      MarbleWidget.cpp  
 M  +1 -1      TileLoader.h  
 M  +1 -1      routing/OrsRoutingProvider.h  
 M  +1 -1      routing/YoursRoutingProvider.h  


--- trunk/KDE/kdeedu/marble/src/lib/DataMigration.cpp #1117321:1117322
@@ -8,9 +8,14 @@
 // Copyright 2010      Bastian Holst <bastianholst at gmx.de>
 //
 
-// std
-#include <limits>
+// Self
+#include "DataMigration.h"
 
+// Marble
+#include "MarbleDebug.h"
+#include "MarbleDirs.h"
+#include "ui_DataMigrationWidget.h"
+
 // Qt
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
@@ -21,14 +26,9 @@
 #include <QtGui/QDialog>
 #include <QtGui/QProgressDialog>
 
-// Marble
-#include "MarbleDebug.h"
-#include "MarbleDirs.h"
-#include "ui_DataMigrationWidget.h"
+// std
+#include <limits>
 
-// Self
-#include "DataMigration.h"
-
 using namespace Marble;
 
 DataMigration::DataMigration( QObject *parent )
@@ -80,7 +80,7 @@
         mDebug() << "Removing of the target directory failed";
     }
 
-    // Trying to simply rename the directory. This is the fastest method, but it is not allways
+    // Trying to simply rename the directory. This is the fastest method, but it is not always
     // possible. For example when the directories are on different file systems.
     // If the renaming of the directory is not successful, we have to copy and delete each
     // file separatetly.
--- trunk/KDE/kdeedu/marble/src/lib/MarbleMap.h #1117321:1117322
@@ -799,7 +799,7 @@
     
     /**
      * @brief Reload the currently displayed map by reloading texture tiles
-     *        from the internet. In the future this should be extended to all
+     *        from the Internet. In the future this should be extended to all
      *        kinds of data which is used in the map.
      */
     void reload() const;
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.cpp #1117321:1117322
@@ -93,7 +93,7 @@
       * @brief Rotate the globe in the given direction in discrete steps
       * @param stepsRight Number of steps to go right. Negative values go left.
       * @param stepsDown Number of steps to go down. Negative values go up.
-      * @param mode Interpolation mode to use when travelling to the target
+      * @param mode Interpolation mode to use when traveling to the target
       */
     void moveByStep(MarbleWidget* widget, int stepsRight, int stepsDown, FlyToMode mode);
 
--- trunk/KDE/kdeedu/marble/src/lib/TileLoader.h #1117321:1117322
@@ -58,7 +58,7 @@
                        QString const & id, DownloadUsage );
 
     // when this signal is emitted, the TileLoader gives up ownership of
-    // the corrsponding tile. Might be better to explicitely transfer...
+    // the corrsponding tile. Might be better to explicitly transfer...
     void tileCompleted( TileId const & composedTileId, TileId const & baseTileId );
 
  private:
--- trunk/KDE/kdeedu/marble/src/lib/routing/OrsRoutingProvider.h #1117321:1117322
@@ -45,7 +45,7 @@
     /** Route data was retrieved via http */
     void retrieveData(QNetworkReply* reply);
 
-    /** A network error occured */
+    /** A network error occurred */
     void handleError(QNetworkReply::NetworkError);
 
 private:
--- trunk/KDE/kdeedu/marble/src/lib/routing/YoursRoutingProvider.h #1117321:1117322
@@ -38,7 +38,7 @@
     /** Route data was retrieved via http */
     void retrieveData(QNetworkReply* reply);
 
-    /** A network error occured */
+    /** A network error occurred */
     void handleError(QNetworkReply::NetworkError);
 
 private: