[Marble-commits] KDE/kdeedu/marble/src

[Dennis Nienhüser]

SVN commit 1206205 by nienhueser:

Add translator comments where lupdate is confused by namespaces. Fixes lupdate based translations working on the wrong context.

 M  +1 -0      QtMainWindow.cpp  
 M  +2 -0      lib/BookmarkInfoDialog.h  
 M  +2 -0      lib/CurrentLocationWidget.cpp  
 M  +1 -0      lib/MapThemeSortFilterProxyModel.cpp  
 M  +1 -0      lib/MarbleMap.cpp  
 M  +2 -1      lib/MarbleWidgetInputHandler.cpp  
 M  +1 -0      lib/MarbleWidgetPopupMenu.cpp  
 M  +1 -0      lib/MeasureTool.cpp  
 M  +1 -0      lib/NewFolderInfoDialog.cpp  
 M  +2 -0      lib/NewFolderInfoDialog.h  
 M  +1 -0      lib/PlacemarkInfoDialog.cpp  
 M  +1 -0      lib/PluginItemDelegate.cpp  
 M  +1 -0      lib/SunControlWidget.cpp  
 M  +1 -0      lib/TimeControlWidget.cpp  
 M  +1 -0      plugins/positionprovider/gpsd/GpsdConnection.cpp  
 M  +2 -0      plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp  
 M  +1 -0      plugins/render/aprs/AprsPlugin.cpp  
 M  +1 -0      plugins/render/navigation/NavigationFloatItem.cpp  
 M  +1 -0      plugins/render/photo/PhotoPlugin.cpp  
 M  +1 -0      plugins/render/weather/BBCWeatherItem.cpp  
 M  +1 -0      plugins/render/weather/WeatherPlugin.cpp  
 M  +1 -0      plugins/render/wikipedia/WikipediaItem.cpp  
 M  +1 -0      plugins/render/wikipedia/WikipediaPlugin.cpp  


--- trunk/KDE/kdeedu/marble/src/QtMainWindow.cpp #1206204:1206205
@@ -81,6 +81,7 @@
 }
 
 using namespace Marble;
+/* TRANSLATOR Marble::MainWindow */
 
 MainWindow::MainWindow(const QString& marbleDataPath, QWidget *parent) :
         QMainWindow(parent),
--- trunk/KDE/kdeedu/marble/src/lib/BookmarkInfoDialog.h #1206204:1206205
@@ -16,6 +16,8 @@
 #include "marble_export.h"
 #include "MarbleRunnerManager.h"
 
+/** @todo FIXME after freeze: Rename to AddBookmarkDialog*/
+
 namespace Marble
 {
 
--- trunk/KDE/kdeedu/marble/src/lib/CurrentLocationWidget.cpp #1206204:1206205
@@ -26,6 +26,8 @@
 #include "routing/RoutingManager.h"
 
 using namespace Marble;
+/* TRANSLATOR Marble::CurrentLocationWidget */
+
 // Ui
 #include "ui_CurrentLocationWidget.h"
 
--- trunk/KDE/kdeedu/marble/src/lib/MapThemeSortFilterProxyModel.cpp #1206204:1206205
@@ -13,6 +13,7 @@
 #include <QtCore/QString>
 
 using namespace Marble;
+/* TRANSLATOR Marble::MapThemeSortFilterProxyModel */
 
 MapThemeSortFilterProxyModel::MapThemeSortFilterProxyModel(QObject *parent)
     : QSortFilterProxyModel(parent)
--- trunk/KDE/kdeedu/marble/src/lib/MarbleMap.cpp #1206204:1206205
@@ -67,6 +67,7 @@
 #include "ViewportParams.h"
 
 using namespace Marble;
+/* TRANSLATOR Marble::MarbleMap */
 
 #ifdef Q_CC_MSVC
 # ifndef KDEWIN_MATH_H
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidgetInputHandler.cpp #1206204:1206205
@@ -43,7 +43,7 @@
 #include "AbstractProjection.h"
 #include "Planet.h"
 
-using namespace Marble;
+namespace Marble {
 
 const int TOOLTIP_START_INTERVAL = 1000;
 
@@ -842,5 +842,6 @@
     d->m_removeLastMeasurePointAction->setEnabled(enableMeasureActions);
 }
 
+}
 
 #include "MarbleWidgetInputHandler.moc"
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidgetPopupMenu.cpp #1206204:1206205
@@ -36,6 +36,7 @@
 #include <QtGui/QMessageBox>
 
 using namespace Marble;
+/* TRANSLATOR Marble::MarbleWidgetPopupMenu */
 
 MarbleWidgetPopupMenu::MarbleWidgetPopupMenu(MarbleWidget *widget, 
                                          MarbleModel *model)
--- trunk/KDE/kdeedu/marble/src/lib/MeasureTool.cpp #1206204:1206205
@@ -34,6 +34,7 @@
 #include "global.h"
 
 using namespace Marble;
+/* TRANSLATOR Marble::MeasureTool */
 
 MeasureTool::MeasureTool( MarbleModel *model, QObject* parent )
     : QObject( parent ),
--- trunk/KDE/kdeedu/marble/src/lib/NewFolderInfoDialog.cpp #1206204:1206205
@@ -15,6 +15,7 @@
 #include <QtGui/QLineEdit>
 
 using namespace Marble;
+/* TRANSLATOR Marble::NewFolderInfoDialog */
 
 NewFolderInfoDialog::NewFolderInfoDialog(MarbleWidget *parent)
     : QDialog(parent), m_widget(parent)
--- trunk/KDE/kdeedu/marble/src/lib/NewFolderInfoDialog.h #1206204:1206205
@@ -15,6 +15,8 @@
 namespace Marble
 {
 
+/** @todo FIXME after freeze: Rename to AddBookmarkFolderDialog*/
+
 class MARBLE_EXPORT NewFolderInfoDialog : public QDialog, private Ui::NameDialog
 {
 
--- trunk/KDE/kdeedu/marble/src/lib/PlacemarkInfoDialog.cpp #1206204:1206205
@@ -28,6 +28,7 @@
 #include "MarblePlacemarkModel.h"
 
 using namespace Marble;
+/* TRANSLATOR Marble::PlacemarkInfoDialog */
 
 PlacemarkInfoDialog::PlacemarkInfoDialog(const QPersistentModelIndex &index, QWidget *parent)
     : QDialog(parent), m_index(index)
--- trunk/KDE/kdeedu/marble/src/lib/PluginItemDelegate.cpp #1206204:1206205
@@ -27,6 +27,7 @@
 #include <QtGui/QStandardItem>
 
 using namespace Marble;
+/* TRANSLATOR Marble::PluginItemDelegate */
 
 const QSize iconSize( 16, 16 );
 
--- trunk/KDE/kdeedu/marble/src/lib/SunControlWidget.cpp #1206204:1206205
@@ -22,6 +22,7 @@
 #include "MarbleDebug.h"
 
 using namespace Marble;
+/* TRANSLATOR Marble::SunControlWidget */
 
 SunControlWidget::SunControlWidget( SunLocator* sunLocator, QWidget* parent )
     : QDialog( parent ),
--- trunk/KDE/kdeedu/marble/src/lib/TimeControlWidget.cpp #1206204:1206205
@@ -20,6 +20,7 @@
 #include "MarbleDebug.h"
 
 using namespace Marble;
+/* TRANSLATOR Marble::TimeControlWidget */
 
 TimeControlWidget::TimeControlWidget( MarbleClock* clock, QWidget* parent )
     : QDialog( parent ),
--- trunk/KDE/kdeedu/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp #1206204:1206205
@@ -15,6 +15,7 @@
 #include <errno.h>
 
 using namespace Marble;
+/* TRANSLATOR Marble::GpsdConnection */
 
 GpsdConnection::GpsdConnection( QObject* parent )
     : QObject( parent ),
--- trunk/KDE/kdeedu/marble/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp #1206204:1206205
@@ -15,6 +15,8 @@
 #include <math.h>
 
 using namespace Marble;
+/* TRANSLATOR Marble::GpsdPositionProviderPlugin */
+
 using namespace std;
 
 QString GpsdPositionProviderPlugin::name() const
--- trunk/KDE/kdeedu/marble/src/plugins/render/aprs/AprsPlugin.cpp #1206204:1206205
@@ -34,6 +34,7 @@
 #include "AprsFile.h"
 
 using namespace Marble;
+/* TRANSLATOR Marble::AprsPlugin */
 
 AprsPlugin::AprsPlugin()
     : m_mutex( new QMutex ),
--- trunk/KDE/kdeedu/marble/src/plugins/render/navigation/NavigationFloatItem.cpp #1206204:1206205
@@ -26,6 +26,7 @@
 #include "MarbleGraphicsGridLayout.h"
 
 using namespace Marble;
+/* TRANSLATOR Marble::NavigationFloatItem */
 
 const int defaultMinZoom = 900;
 const int defaultMaxZoom = 2400;
--- trunk/KDE/kdeedu/marble/src/plugins/render/photo/PhotoPlugin.cpp #1206204:1206205
@@ -17,6 +17,7 @@
 #include "MarbleDebug.h"
 
 using namespace Marble;
+/* TRANSLATOR Marble::PhotoPlugin */
 
 PhotoPlugin::PhotoPlugin()
     : m_isInitialized( false )
--- trunk/KDE/kdeedu/marble/src/plugins/render/weather/BBCWeatherItem.cpp #1206204:1206205
@@ -22,6 +22,7 @@
 #include <QtCore/QUrl>
 
 using namespace Marble;
+/* TRANSLATOR Marble::BBCWeatherItem */
 
 BBCWeatherItem::BBCWeatherItem( QObject *parent )
     : WeatherItem( parent ),
--- trunk/KDE/kdeedu/marble/src/plugins/render/weather/WeatherPlugin.cpp #1206204:1206205
@@ -29,6 +29,7 @@
 #include <QtGui/QPushButton>
 
 using namespace Marble;
+/* TRANSLATOR Marble::WeatherPlugin */
 
 const quint32 numberOfStationsPerFetch = 20;
 
--- trunk/KDE/kdeedu/marble/src/plugins/render/wikipedia/WikipediaItem.cpp #1206204:1206205
@@ -26,6 +26,7 @@
 #include "TinyWebBrowser.h"
 
 using namespace Marble;
+/* TRANSLATOR Marble::WikipediaItem */
 
 // The Wikipedia icon is not a square
 const QRect wikiIconRect( 0, 0, 32, 27 );
--- trunk/KDE/kdeedu/marble/src/plugins/render/wikipedia/WikipediaPlugin.cpp #1206204:1206205
@@ -23,6 +23,7 @@
 #include <QtGui/QLabel>
 
 using namespace Marble;
+/* TRANSLATOR Marble::WikipediaPlugin */
 
 const quint32 maximumNumberOfItems = 99;