summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-21 13:38:28 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-21 13:38:28 (GMT)
commit0026e64a35cd5cc0ed7c4c3b0f9ea328d9fe72fb (patch)
tree0b44409d5cfd1db295b30cf0210db18d815863cf
parent8948afb91b52b237cb2c49d47c595490f853617a (diff)
Remove marble/global.h, deprecated since 2012
-rwxr-xr-xMessages.sh2
-rw-r--r--src/lib/marble/CMakeLists.txt1
-rw-r--r--src/lib/marble/global.h4
3 files changed, 1 insertions, 6 deletions
diff --git a/Messages.sh b/Messages.sh
index acc8348..7ca5aed 100755
--- a/Messages.sh
+++ b/Messages.sh
@@ -44,5 +44,5 @@ $EXTRACT_TR_STRINGS \
src/apps/marble-ui/ControlView.cpp \
`find src/plugins -name '*.cpp' -o -name '*.ui' | grep -v '/test/'` \
`find src/lib -name '*.cpp' -o -name '*.ui'` \
- src/lib/marble/global.h src/lib/marble/MarbleGlobal.h rc.cpp \
+ src/lib/marble/MarbleGlobal.h rc.cpp \
-o $podir/marble_qt.pot
diff --git a/src/lib/marble/CMakeLists.txt b/src/lib/marble/CMakeLists.txt
index fe4fc78..9690167 100644
--- a/src/lib/marble/CMakeLists.txt
+++ b/src/lib/marble/CMakeLists.txt
@@ -499,7 +499,6 @@ install( FILES
TileCoordsPyramid.h
TileLevelRangeWidget.h
QtMarbleConfigDialog.h
- global.h
MarbleMath.h
MarbleColors.h
MarbleGlobal.h
diff --git a/src/lib/marble/global.h b/src/lib/marble/global.h
deleted file mode 100644
index da952fc..0000000
--- a/src/lib/marble/global.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "MarbleGlobal.h"
-#ifdef __GNUC__
-#warning global.h is deprecated. Please #include <marble/MarbleGlobal.h> instead (no further changes needed).
-#endif