[marble] /: Update some comments & notes to Qt5/KF5

Thu Sep 8 14:37:12 UTC 2016

Git commit af95f5f04b6eacb06973a3227faa7366e82bd657 by Friedrich W. H. Kossebau.
Committed on 08/09/2016 at 14:28.
Pushed by kossebau into branch 'master'.

Update some comments & notes to Qt5/KF5

M  +7    -7    INSTALL
M  +2    -2    doc/index.docbook
M  +1    -1    src/apps/marble-kde/KdeMainWindow.cpp
M  +1    -1    src/apps/marble-kde/marble_part.cpp
M  +2    -2    src/lib/marble/MarbleDirs.h
M  +1    -1    src/plasmarunner/plasmarunner.cpp
M  +1    -1    src/thumbnailer/thumbnailer.h

http://commits.kde.org/marble/af95f5f04b6eacb06973a3227faa7366e82bd657

diff --git a/INSTALL b/INSTALL
index 466b71f..33a7f50 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,7 +2,7 @@ This file describes how to build and install Marble
 
 The most recent version of this file can be found at:
 
-http://marble.kde.org/sources.php
+https://marble.kde.org/sources.php
 
 Please refer to the online version above if possible.
 
@@ -14,9 +14,9 @@ NOTE: This file describes how to build Marble as a stand-alone
 
 
 Prerequisites for building Marble are:
- - Qt 4.7 or newer
- - cmake version 2.4 or newer
- - (optional): kdelibs from the KDE subversion repositories.
+ - Qt 5.3 or newer
+ - Cmake version 2.8.12 or newer
+ - (optional): KDE Frameworks 5.7 or newer (KF5) from the KDE repositories.
  - other dependencies are optional
 
 A checkout of Marble. You can check out Marble using GIT via the command:
@@ -27,7 +27,7 @@ git clone git://anongit.kde.org/marble ~/marble/sources
 You can build and install Marble in two different ways:
 
 1. As a Qt-only application.
-2. As a KDE application, using kdelibs and KDE based classes.
+2. As a KF5-based application, using KDE Frameworks 5 classes.
 
 Choose one of them and read below for how to do it.
 
@@ -81,10 +81,10 @@ Finally, also from the build directory, type:
 
 and start Marble either from the menu or via the command line:
 
-  marble
+  marble-qt
 
 
-2. Build Marble as a KDE application.
+2. Build Marble as a KF5-based application.
 
 2.1 Create a build directory
 
diff --git a/doc/index.docbook b/doc/index.docbook
index 2cf27ed..895e446 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -1456,8 +1456,8 @@ url="https://owncloud.com/">ownClowd official website</ulink>.</para>
 			 <title>Compilation and Installation</title>
 
              <para>
-                 &marble; can be compiled as a &Qt; 4-only version as well as featuring &kde; 4 support.
-                 To compile &marble; with &Qt; 4-only support check out &marble; from &kde; Git into ~/marble and just do: <command>cmake -DWITH_KF5=FALSE ~/marble</command> and <command>sudo make install</command>. To compile &marble; with &kde; support check instructions on how to compile &kde; applications at <ulink url="http://techbase.kde.org/">&kde;'s TechBase</ulink>.
+                 &marble; can be compiled as a &Qt; 5-only version as well as featuring &kde; &frameworks; 5 usage.
+                 To compile &marble; with &Qt; 5-only support check out &marble; from its &kde; Git repository into ~/marble and just do: <command>cmake -DWITH_KF5=FALSE ~/marble</command> and <command>sudo make install</command>. To compile &marble; with &kde; &frameworks; 5 usage check instructions on how to compile &kde; applications at <ulink url="http://techbase.kde.org/">&kde;'s TechBase</ulink>.
              </para> 
 		 </sect1>
 
diff --git a/src/apps/marble-kde/KdeMainWindow.cpp b/src/apps/marble-kde/KdeMainWindow.cpp
index 2c879a9..a668b8a 100644
--- a/src/apps/marble-kde/KdeMainWindow.cpp
+++ b/src/apps/marble-kde/KdeMainWindow.cpp
@@ -18,7 +18,7 @@
 #include <QCoreApplication>
 #include <QCloseEvent>
 
-// KDE
+// KF
 #include <klocalizedstring.h>
 #include <kactioncollection.h>
 #include <kparts/part.h>
diff --git a/src/apps/marble-kde/marble_part.cpp b/src/apps/marble-kde/marble_part.cpp
index 755c836..b312c0e 100644
--- a/src/apps/marble-kde/marble_part.cpp
+++ b/src/apps/marble-kde/marble_part.cpp
@@ -32,7 +32,7 @@
 #include <QMenu>
 #include <QStatusBar>
 
-// KDE
+// KF
 #include <kaboutdata.h>
 #include <kactioncollection.h>
 #include <kconfigdialog.h>
diff --git a/src/lib/marble/MarbleDirs.h b/src/lib/marble/MarbleDirs.h
index 1d7a16e..fa44433 100644
--- a/src/lib/marble/MarbleDirs.h
+++ b/src/lib/marble/MarbleDirs.h
@@ -25,8 +25,8 @@ namespace Marble
 /**
  * @short A class that manages data look-up for Marble.
  *
- * The class basically does for Marble what KStandardDirs does for KDE.
- * Given that the MarbleWidget is a Qt4-only library and given that it 
+ * The class basically does for Marble what KStandardDirs did for KDE4.
+ * Given that the MarbleWidget is a Qt5-only library and given that it
  * comes with its own model and data we need this class.
  *
  * The class needs to respect the requirements of the different plattforms,
diff --git a/src/plasmarunner/plasmarunner.cpp b/src/plasmarunner/plasmarunner.cpp
index c80fc43..f6de8a4 100644
--- a/src/plasmarunner/plasmarunner.cpp
+++ b/src/plasmarunner/plasmarunner.cpp
@@ -22,7 +22,7 @@
 #include <BookmarkManager.h>
 #include <GeoDataTreeModel.h>
 
-// KF5
+// KF
 #include <KLocalizedString>
 
 // Qt
diff --git a/src/thumbnailer/thumbnailer.h b/src/thumbnailer/thumbnailer.h
index fb5df3e..a85606a 100644
--- a/src/thumbnailer/thumbnailer.h
+++ b/src/thumbnailer/thumbnailer.h
@@ -20,7 +20,7 @@
 // Marble
 #include "MarbleMap.h"
 
-// KDE
+// KF
 #include <KIOWidgets/kio/thumbcreator.h>
 
 // Qt

