[kde-doc-english] [knavalbattle/renaming] /: All references to KBattleship replaced by KNavalbattle.
Roney Gomes
roney477 at gmail.com
Sun Apr 7 19:58:40 UTC 2013
Git commit c020aac691d6950f0fe22f3d7de804702ca306e3 by Roney Gomes.
Committed on 07/04/2013 at 16:31.
Pushed by roneygomes into branch 'renaming'.
All references to KBattleship replaced by KNavalbattle.
Due copyright issues KBattleship is now called KNavalbattle. Even so,
the program's installation folder as well as its image files and final
binary are all named making references to KBattleship.
This patch removes all references to the project's previous name,
changing its build settings as well as renaming some of its files.
M +1 -1 CMakeLists.txt
M +1 -1 data/pictures/CMakeLists.txt
R +- -- data/pictures/hi128-app-knavalbattle.png [from: data/pictures/hi128-app-kbattleship.png - 100% similarity]
R +- -- data/pictures/hi16-app-knavalbattle.png [from: data/pictures/hi16-app-kbattleship.png - 100% similarity]
R +- -- data/pictures/hi22-app-knavalbattle.png [from: data/pictures/hi22-app-kbattleship.png - 100% similarity]
R +- -- data/pictures/hi32-app-knavalbattle.png [from: data/pictures/hi32-app-kbattleship.png - 100% similarity]
R +- -- data/pictures/hi48-app-knavalbattle.png [from: data/pictures/hi48-app-kbattleship.png - 100% similarity]
R +- -- data/pictures/hi64-app-knavalbattle.png [from: data/pictures/hi64-app-kbattleship.png - 100% similarity]
M +1 -1 data/sounds/CMakeLists.txt
M +1 -1 doc/CMakeLists.txt
M +1 -1 doc/index.docbook
M +9 -9 src/CMakeLists.txt
M +1 -1 src/Messages.sh
R +0 -0 src/knavalbattle.desktop [from: src/kbattleship.desktop - 100% similarity]
R +0 -0 src/knavalbattle.kcfg [from: src/kbattleship.kcfg - 100% similarity]
R +0 -0 src/knavalbattle.protocol [from: src/kbattleship.protocol - 100% similarity]
R +0 -0 src/knavalbattleui.rc [from: src/kbattleshipui.rc - 100% similarity]
M +1 -1 src/main.cpp
M +1 -1 src/settingsbase.kcfgc
http://commits.kde.org/knavalbattle/c020aac691d6950f0fe22f3d7de804702ca306e3
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a4e3f8..c80f7e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(kbattleship)
+project(knavalbattle)
if(NOT COMPILING_KDEGAMES)
find_package(KDE4 REQUIRED)
diff --git a/data/pictures/CMakeLists.txt b/data/pictures/CMakeLists.txt
index 32c7fb3..3059bfd 100644
--- a/data/pictures/CMakeLists.txt
+++ b/data/pictures/CMakeLists.txt
@@ -2,7 +2,7 @@
install(FILES
default.desktop
default_theme.svgz
-DESTINATION ${DATA_INSTALL_DIR}/kbattleship/pictures)
+DESTINATION ${DATA_INSTALL_DIR}/knavalbattle/pictures)
kde4_install_icons(${ICON_INSTALL_DIR})
diff --git a/data/pictures/hi128-app-kbattleship.png b/data/pictures/hi128-app-knavalbattle.png
similarity index 100%
rename from data/pictures/hi128-app-kbattleship.png
rename to data/pictures/hi128-app-knavalbattle.png
diff --git a/data/pictures/hi16-app-kbattleship.png b/data/pictures/hi16-app-knavalbattle.png
similarity index 100%
rename from data/pictures/hi16-app-kbattleship.png
rename to data/pictures/hi16-app-knavalbattle.png
diff --git a/data/pictures/hi22-app-kbattleship.png b/data/pictures/hi22-app-knavalbattle.png
similarity index 100%
rename from data/pictures/hi22-app-kbattleship.png
rename to data/pictures/hi22-app-knavalbattle.png
diff --git a/data/pictures/hi32-app-kbattleship.png b/data/pictures/hi32-app-knavalbattle.png
similarity index 100%
rename from data/pictures/hi32-app-kbattleship.png
rename to data/pictures/hi32-app-knavalbattle.png
diff --git a/data/pictures/hi48-app-kbattleship.png b/data/pictures/hi48-app-knavalbattle.png
similarity index 100%
rename from data/pictures/hi48-app-kbattleship.png
rename to data/pictures/hi48-app-knavalbattle.png
diff --git a/data/pictures/hi64-app-kbattleship.png b/data/pictures/hi64-app-knavalbattle.png
similarity index 100%
rename from data/pictures/hi64-app-kbattleship.png
rename to data/pictures/hi64-app-knavalbattle.png
diff --git a/data/sounds/CMakeLists.txt b/data/sounds/CMakeLists.txt
index 7833b8e..722cbe5 100644
--- a/data/sounds/CMakeLists.txt
+++ b/data/sounds/CMakeLists.txt
@@ -2,4 +2,4 @@ install(FILES ship-player-shoot-water.ogg
ship-player1-shoot.ogg
ship-player2-shoot.ogg
ship-sink.ogg
- DESTINATION ${DATA_INSTALL_DIR}/kbattleship/sounds)
+ DESTINATION ${DATA_INSTALL_DIR}/knavalbattle/sounds)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 4e314e5..8faf409 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,3 +1,3 @@
########### install files ###############
#
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kbattleship)
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR knavalbattle)
diff --git a/doc/index.docbook b/doc/index.docbook
index 7bc34ec..bfa2099 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -63,7 +63,7 @@
<keywordset>
<keyword>KDE</keyword>
<keyword>kdegames</keyword>
-<keyword>kbattleship</keyword>
+<keyword>knavalbattle</keyword>
<keyword>game</keyword>
<keyword>battleship</keyword>
<keyword>battle</keyword>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 224e890..e4452cf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,6 @@
include_directories(${CMAKE_SOURCE_DIR}/libkdegames/highscore ${CMAKE_CURRENT_SOURCE_DIR}/kwelcomescreen)
-set(kbattleship_SRCS
+set(knavalbattle_SRCS
ai/ai.cpp
ai/dummyai.cpp
ai/smartai.cpp
@@ -40,14 +40,14 @@ set(kbattleship_SRCS
welcomescreen.cpp)
-kde4_add_kcfg_files(kbattleship_SRCS settingsbase.kcfgc)
+kde4_add_kcfg_files(knavalbattle_SRCS settingsbase.kcfgc)
-kde4_add_app_icon(kbattleship_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../data/pictures/hi*-app-kbattleship.png")
-kde4_add_executable(kbattleship ${kbattleship_SRCS} ${kwelcomescreen_SRCS})
+kde4_add_app_icon(knavalbattle_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../data/pictures/hi*-app-knavalbattle.png")
+kde4_add_executable(knavalbattle ${knavalbattle_SRCS} ${kwelcomescreen_SRCS})
-target_link_libraries(kbattleship ${QT_QTXML_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_KDNSSD_LIBS} kdegames)
+target_link_libraries(knavalbattle ${QT_QTXML_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_KDNSSD_LIBS} kdegames)
-install(TARGETS kbattleship ${INSTALL_TARGETS_DEFAULT_ARGS} )
-install( FILES kbattleshipui.rc DESTINATION ${DATA_INSTALL_DIR}/kbattleship )
-install(PROGRAMS kbattleship.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
-install( FILES kbattleship.protocol DESTINATION ${SERVICES_INSTALL_DIR})
+install(TARGETS knavalbattle ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install( FILES knavalbattleui.rc DESTINATION ${DATA_INSTALL_DIR}/knavalbattle )
+install(PROGRAMS knavalbattle.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install( FILES knavalbattle.protocol DESTINATION ${SERVICES_INSTALL_DIR})
diff --git a/src/Messages.sh b/src/Messages.sh
index 1f3f6ff..ba6b1ac 100644
--- a/src/Messages.sh
+++ b/src/Messages.sh
@@ -1,3 +1,3 @@
$EXTRACTRC *.rc *.kcfg >> rc.cpp
-$XGETTEXT `find . -name "*.cpp"` -o $podir/kbattleship.pot
+$XGETTEXT `find . -name "*.cpp"` -o $podir/knavalbattle.pot
diff --git a/src/kbattleship.desktop b/src/knavalbattle.desktop
similarity index 100%
rename from src/kbattleship.desktop
rename to src/knavalbattle.desktop
diff --git a/src/kbattleship.kcfg b/src/knavalbattle.kcfg
similarity index 100%
rename from src/kbattleship.kcfg
rename to src/knavalbattle.kcfg
diff --git a/src/kbattleship.protocol b/src/knavalbattle.protocol
similarity index 100%
rename from src/kbattleship.protocol
rename to src/knavalbattle.protocol
diff --git a/src/kbattleshipui.rc b/src/knavalbattleui.rc
similarity index 100%
rename from src/kbattleshipui.rc
rename to src/knavalbattleui.rc
diff --git a/src/main.cpp b/src/main.cpp
index 1f8c219..d1ffb45 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,7 +21,7 @@
int main(int argc, char** argv)
{
- KAboutData aboutData("kbattleship", 0, ki18n("Naval Battle"), "2.0",
+ KAboutData aboutData("knavalbattle", 0, ki18n("Naval Battle"), "2.0",
ki18n("The KDE ship sinking game"), KAboutData::License_GPL,
ki18n("(c) 2000-2005 Nikolas Zimmermann, Daniel Molkentin\n"
"(c) 2007 Paolo Capriotti"), KLocalizedString(), "http://games.kde.org/kbattleship" );
diff --git a/src/settingsbase.kcfgc b/src/settingsbase.kcfgc
index f62547a..2439313 100644
--- a/src/settingsbase.kcfgc
+++ b/src/settingsbase.kcfgc
@@ -1,4 +1,4 @@
-File=kbattleship.kcfg
+File=knavalbattle.kcfg
ClassName=SettingsBase
Singleton=true
Mutators=true
More information about the kde-doc-english
mailing list