[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdegames
From: Parker Coates <parker.coates () kdemail ! net>
Date: 2012-02-19 5:06:54
Message-ID: 20120219050654.C43D3AC895 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1280805 by coates:
Move KCardCache, KCardDeckInfo and KCardDialog into LSkat tree.
These classes are currently only used within LSkat and will be
deprecated by libkcardgame, so we can safely move them into the lskat
sources as part of the ongoing libkdegames API clean up.
M +0 -7 libkdegames/CMakeLists.txt
D libkdegames/cardcache.cpp
D libkdegames/cardcache.h
D libkdegames/cardcache_p.h
D libkdegames/carddeckinfo.cpp
D libkdegames/carddeckinfo.h
D libkdegames/carddeckinfo_p.h
M +0 -1 libkdegames/includes/CMakeLists.txt
D libkdegames/includes/KCardCache
D libkdegames/includes/KCardDeckInfo
D libkdegames/includes/KCardDialog
D libkdegames/kcarddialog.cpp
D libkdegames/kcarddialog.h
D libkdegames/kcarddialog.png
D libkdegames/kgamecardselector.ui
M +7 -2 lskat/src/CMakeLists.txt
A lskat/src/fromlibkdegames (directory)
A lskat/src/fromlibkdegames/README
A lskat/src/fromlibkdegames/cardcache.cpp libkdegames/cardcache.cpp#1280777 [License: LGPL (v2)]
A lskat/src/fromlibkdegames/cardcache.h libkdegames/cardcache.h#1280777 [License: LGPL (v2)]
A lskat/src/fromlibkdegames/cardcache_p.h libkdegames/cardcache_p.h#1280777 [License: LGPL (v2)]
A lskat/src/fromlibkdegames/carddeckinfo.cpp libkdegames/carddeckinfo.cpp#1280777 [License: LGPL (v2)]
A lskat/src/fromlibkdegames/carddeckinfo.h libkdegames/carddeckinfo.h#1280777 [License: LGPL (v2)]
A lskat/src/fromlibkdegames/carddeckinfo_p.h libkdegames/carddeckinfo_p.h#1280777 [License: LGPL (v2)]
A lskat/src/fromlibkdegames/kcarddialog.cpp libkdegames/kcarddialog.cpp#1280777 [License: LGPL (v2)]
A lskat/src/fromlibkdegames/kcarddialog.h libkdegames/kcarddialog.h#1280777 [License: LGPL (v2)]
A lskat/src/fromlibkdegames/kgamecardselector.ui libkdegames/kgamecardselector.ui#1280777
M +2 -2 lskat/src/mainwindow.cpp
M +1 -2 lskat/src/thememanager.cpp
--- trunk/KDE/kdegames/libkdegames/CMakeLists.txt #1280804:1280805
@@ -72,8 +72,6 @@
kgame/dialogs/kgamedialog.cpp
kgame/dialogs/kgamedialogconfig.cpp
kgame/dialogs/kgameerrordialog.cpp
- carddeckinfo.cpp
- kcarddialog.cpp
kchat.cpp
kchatbase.cpp
kchatbaseitemdelegate.cpp
@@ -91,7 +89,6 @@
kgamethemeselector.cpp
kstandardgameaction.cpp
kgamedifficulty.cpp
- cardcache.cpp
)
if(Q_WS_X11)
set(kdegames_LIB_SRCS ${kdegames_LIB_SRCS} chooserastergraphicssystem.cpp)
@@ -99,7 +96,6 @@
kde4_add_ui_files(kdegames_LIB_SRCS
kgamethemeselector.ui
- kgamecardselector.ui
)
kde4_add_library(kdegames SHARED ${kdegames_LIB_SRCS})
@@ -117,9 +113,6 @@
install(FILES
libkdegames_export.h
- cardcache.h
- carddeckinfo.h
- kcarddialog.h
kstandardgameaction.h
kchatbase.h
kchatbasemodel.h
--- trunk/KDE/kdegames/libkdegames/includes/CMakeLists.txt #1280804:1280805
@@ -2,7 +2,6 @@
install( FILES
KgAudioScene
KgSound
- KCardDialog
KChat
KChatBase
KChatDialog
--- trunk/KDE/kdegames/lskat/src/CMakeLists.txt #1280804:1280805
@@ -21,10 +21,15 @@
player.cpp
abstractinput.cpp
mouseinput.cpp
- aiinput.cpp )
+ aiinput.cpp
+ fromlibkdegames/cardcache.cpp
+ fromlibkdegames/carddeckinfo.cpp
+ fromlibkdegames/kcarddialog.cpp )
-kde4_add_ui_files( lskat_SRCS namedialog.ui )
+kde4_add_ui_files( lskat_SRCS
+ namedialog.ui
+ fromlibkdegames/kgamecardselector.ui )
configure_file(config-src.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-src.h)
--- trunk/KDE/kdegames/lskat/src/mainwindow.cpp #1280804:1280805
@@ -39,8 +39,6 @@
#include <kicon.h>
#include <kmenubar.h>
#include <klocale.h>
-#include <kcarddialog.h>
-#include <carddeckinfo.h>
#include <krandom.h>
#include <kglobal.h>
#include <ktoolbar.h>
@@ -60,6 +58,8 @@
#include "mouseinput.h"
#include "aiinput.h"
#include "namedialogwidget.h"
+#include "fromlibkdegames/kcarddialog.h"
+#include "fromlibkdegames/carddeckinfo.h"
// Configuration file
#include <config-src.h>
--- trunk/KDE/kdegames/lskat/src/thememanager.cpp #1280804:1280805
@@ -37,11 +37,10 @@
#include <kconfiggroup.h>
#include <kstandarddirs.h>
-#include <cardcache.h>
-
// Local includes
#include "lskatglobal.h"
#include "deck.h"
+#include "fromlibkdegames/cardcache.h"
// SVG id for accessing the backside of a card
#define CARDBACK_SVGID "back"
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic