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

List:       kde-commits
Subject:    =?utf-8?q?=5Blibkmap=5D_/=3A_Fix_krazy2_warnings=2E?=
From:       Michael Georg Hansen <mike () mghansen ! de>
Date:       2011-02-28 21:10:56
Message-ID: 20110228211056.9FE09A60C9 () git ! kde ! org
[Download RAW message or body]

Git commit 402ecc45a77e62a76dc04ef995d4450d426a284c by Michael Georg Hansen.
Committed on 28/02/2011 at 22:10.
Pushed by mghansen into branch 'master'.

Fix krazy2 warnings.

M  +2    -2    calibrator/calibrator.cpp     
M  +1    -1    calibrator/calibrator.h     
M  +1    -1    demo/dragdrophandler.h     
M  +1    -1    demo/mainwindow.h     
M  +3    -3    libkmap/kmap_tileindex.h     

http://commits.kde.org/libkmap/402ecc45a77e62a76dc04ef995d4450d426a284c

diff --git a/calibrator/calibrator.cpp b/calibrator/calibrator.cpp
index ba4e46d..69f9b68 100644
--- a/calibrator/calibrator.cpp
+++ b/calibrator/calibrator.cpp
@@ -158,7 +158,7 @@ Calibrator::Calibrator()
     d->sbLevel = new QSpinBox(this);
     d->sbLevel->setMinimum(1);
     d->sbLevel->setMaximum(KMap::TileIndex::MaxLevel);
-    QLabel* const labelsbLevel = new QLabel(i18n("Level:"), this);
+    QLabel* const labelsbLevel = new QLabel(i18nc("Tile level", "Level:"), this);
     labelsbLevel->setBuddy(d->sbLevel);
 
     d->zoomDisplay = new QLineEdit(this);
@@ -344,7 +344,7 @@ void Calibrator::slotAddMapWidget()
     boxLayout->addWidget(mapWidget);
     boxLayout->addWidget(mapWidget->getControlWidget());
 
-    QAction* const activateMapAction = new QAction(i18n("Active"), mapWidget);
+    QAction* const activateMapAction = new QAction(i18nc("Set the widget active", "Active"), mapWidget);
     activateMapAction->setData(QVariant::fromValue<void*>(mapWidget));
     activateMapAction->setCheckable(true);
     QToolButton* const toolButton = new QToolButton(mapWidget);
diff --git a/calibrator/calibrator.h b/calibrator/calibrator.h
index 4ec245c..06fcab1 100644
--- a/calibrator/calibrator.h
+++ b/calibrator/calibrator.h
@@ -40,7 +40,7 @@ class CalibratorModelHelper : public KMap::ModelHelper
 Q_OBJECT
 
 public:
-    CalibratorModelHelper(QStandardItemModel* const model, QObject* const parent = 0);
+    explicit CalibratorModelHelper(QStandardItemModel* const model, QObject* const parent = 0);
     ~CalibratorModelHelper();
 
     // these are necessary for grouped and ungrouped models
diff --git a/demo/dragdrophandler.h b/demo/dragdrophandler.h
index 22883e9..72a4ac4 100644
--- a/demo/dragdrophandler.h
+++ b/demo/dragdrophandler.h
@@ -54,7 +54,7 @@ class DemoDragDropHandler : public KMap::DragDropHandler
 
 public:
 
-    DemoDragDropHandler(QAbstractItemModel* const pModel, QObject* const parent = 0);
+    explicit DemoDragDropHandler(QAbstractItemModel* const pModel, QObject* const parent = 0);
     virtual ~DemoDragDropHandler();
 
     virtual Qt::DropAction accepts(const QDropEvent* e);
diff --git a/demo/mainwindow.h b/demo/mainwindow.h
index 0ae9a75..257aa4f 100644
--- a/demo/mainwindow.h
+++ b/demo/mainwindow.h
@@ -70,7 +70,7 @@ class MainWindow : public KMainWindow
 
 public:
 
-    MainWindow(KCmdLineArgs* const cmdLineArgs, QWidget* const parent = 0);
+    explicit MainWindow(KCmdLineArgs* const cmdLineArgs, QWidget* const parent = 0);
     ~MainWindow();
 
 public Q_SLOTS:
diff --git a/libkmap/kmap_tileindex.h b/libkmap/kmap_tileindex.h
index 2047f7e..3daa3aa 100644
--- a/libkmap/kmap_tileindex.h
+++ b/libkmap/kmap_tileindex.h
@@ -29,9 +29,9 @@
 
 // Qt includes
 
-#include <QBitArray>
-#include <QObject>
-#include <QPoint>
+#include <QtCore/QBitArray>
+#include <QtCore/QObject>
+#include <QtCore/QPoint>
 
 // local includes
 

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