Commit 82aa2971 authored by Albert Astals Cid's avatar Albert Astals Cid
Browse files

Fix DLL linkage of lskat on parts that had been brought from old libkdegames.

Patch by Andrius Ribas
SVN review 7009

svn path=/trunk/KDE/kdegames/lskat/; revision=1307615
parent f65969b8
...@@ -31,7 +31,7 @@ class QSizeF; ...@@ -31,7 +31,7 @@ class QSizeF;
/** /**
* \class KCardInfo cardcache.h <KCardCache> * \class KCardInfo cardcache.h <KCardCache>
*/ */
class KDEGAMES_EXPORT KCardInfo class KCardInfo
{ {
public: public:
enum Suit { None, Diamond, Heart, Club, Spade }; enum Suit { None, Diamond, Heart, Club, Spade };
...@@ -79,7 +79,7 @@ private: ...@@ -79,7 +79,7 @@ private:
* </code> * </code>
* *
*/ */
class KDEGAMES_EXPORT KCardCache class KCardCache
{ {
public: public:
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include <libkdegames_export.h>
class KConfigGroup; class KConfigGroup;
...@@ -38,7 +37,7 @@ namespace CardDeckInfo ...@@ -38,7 +37,7 @@ namespace CardDeckInfo
* @param name The untranslated name of the back deck. * @param name The untranslated name of the back deck.
* @return The file name and path to the SVG file or QString() if not available. * @return The file name and path to the SVG file or QString() if not available.
*/ */
KDEGAMES_EXPORT QString backSVGFilePath(const QString& name); QString backSVGFilePath(const QString& name);
/** Retrieve the SVG file belonging to the given card set (front side). /** Retrieve the SVG file belonging to the given card set (front side).
* The SVG IDs used for the card back is '1_club' for Ace of clubs, '10_spade' for * The SVG IDs used for the card back is '1_club' for Ace of clubs, '10_spade' for
...@@ -47,27 +46,27 @@ namespace CardDeckInfo ...@@ -47,27 +46,27 @@ namespace CardDeckInfo
* @param name The untranslated name of the card set. * @param name The untranslated name of the card set.
* @return The file name and path to the SVG file or QString() if not available. * @return The file name and path to the SVG file or QString() if not available.
*/ */
KDEGAMES_EXPORT QString svgFilePath(const QString& name); QString svgFilePath(const QString& name);
/** Retrieve the untranslated name of the default card set (front side). /** Retrieve the untranslated name of the default card set (front side).
* @return The default card set name. * @return The default card set name.
*/ */
KDEGAMES_EXPORT QString defaultDeckName(); QString defaultDeckName();
/** Retrieve the untranslated name of the default card deck (back side). /** Retrieve the untranslated name of the default card deck (back side).
* @return The default card deck name. * @return The default card deck name.
*/ */
KDEGAMES_EXPORT QString defaultBackName(); QString defaultBackName();
/** Retrieve a untranslated name random card set (front side). /** Retrieve a untranslated name random card set (front side).
* @return A radnom card set name. * @return A radnom card set name.
*/ */
KDEGAMES_EXPORT QString randomDeckName(); QString randomDeckName();
/** Retrieve a untranslated name random card deck (back side). /** Retrieve a untranslated name random card deck (back side).
* @return A radnom card deck name. * @return A radnom card deck name.
*/ */
KDEGAMES_EXPORT QString randomBackName(); QString randomBackName();
/** /**
* Retrieve the filename of the card back side. * Retrieve the filename of the card back side.
...@@ -75,21 +74,21 @@ namespace CardDeckInfo ...@@ -75,21 +74,21 @@ namespace CardDeckInfo
* @param name The untranslated name of the card deck. * @param name The untranslated name of the card deck.
* @return The filename. * @return The filename.
*/ */
KDEGAMES_EXPORT QString backFilename(const QString& name); QString backFilename(const QString& name);
/** /**
* retrieve a list of the untranslated names of all installed backsides * retrieve a list of the untranslated names of all installed backsides
* @returns a list of backside names, which can be * @returns a list of backside names, which can be
* used as input to the other functions. * used as input to the other functions.
*/ */
KDEGAMES_EXPORT QStringList backNames(); QStringList backNames();
/** /**
* retrieve a list of the untranslated names of all installed frontsides * retrieve a list of the untranslated names of all installed frontsides
* @return a list of frontside names, which can be * @return a list of frontside names, which can be
* used as input to the other functions. * used as input to the other functions.
*/ */
KDEGAMES_EXPORT QStringList deckNames(); QStringList deckNames();
/** /**
* retrieve the configured front side untranslated theme name * retrieve the configured front side untranslated theme name
...@@ -98,7 +97,7 @@ namespace CardDeckInfo ...@@ -98,7 +97,7 @@ namespace CardDeckInfo
* @param default the default theme to return if the config group has no setting for this * @param default the default theme to return if the config group has no setting for this
* @returns the name of the front side theme name * @returns the name of the front side theme name
*/ */
KDEGAMES_EXPORT QString deckName( const KConfigGroup& group, const QString& defaultTheme = defaultDeckName() ); QString deckName( const KConfigGroup& group, const QString& defaultTheme = defaultDeckName() );
/** /**
* retrieve the configured back side untranslated theme name * retrieve the configured back side untranslated theme name
...@@ -107,7 +106,7 @@ namespace CardDeckInfo ...@@ -107,7 +106,7 @@ namespace CardDeckInfo
* @param default the default theme to return if the config group has no setting for this * @param default the default theme to return if the config group has no setting for this
* @returns the name of the back side theme name * @returns the name of the back side theme name
*/ */
KDEGAMES_EXPORT QString backTheme( const KConfigGroup& group, const QString& defaultTheme = defaultBackName() ); QString backTheme( const KConfigGroup& group, const QString& defaultTheme = defaultBackName() );
/** /**
* retrieve the current value for the lock front-to-backside * retrieve the current value for the lock front-to-backside
...@@ -116,28 +115,28 @@ namespace CardDeckInfo ...@@ -116,28 +115,28 @@ namespace CardDeckInfo
* @param lockDefault the default value in case the group has no setting * @param lockDefault the default value in case the group has no setting
* @returns true when front and backside theme are locked together, else false * @returns true when front and backside theme are locked together, else false
*/ */
KDEGAMES_EXPORT bool lockFrontToBackside( const KConfigGroup& group, bool lockDefault = true ); bool lockFrontToBackside( const KConfigGroup& group, bool lockDefault = true );
/** /**
* store the given frontside @p theme name in the @p group * store the given frontside @p theme name in the @p group
* @param group the KConfigGroup to write to from * @param group the KConfigGroup to write to from
* @param theme the theme untranslated name to store * @param theme the theme untranslated name to store
*/ */
KDEGAMES_EXPORT void writeDeckName( KConfigGroup& group, const QString& theme ); void writeDeckName( KConfigGroup& group, const QString& theme );
/** /**
* store the given backside @p theme name in the @p group * store the given backside @p theme name in the @p group
* @param group the KConfigGroup to write to from * @param group the KConfigGroup to write to from
* @param theme the theme untranslated name to store * @param theme the theme untranslated name to store
*/ */
KDEGAMES_EXPORT void writeBackTheme( KConfigGroup& group, const QString& theme ); void writeBackTheme( KConfigGroup& group, const QString& theme );
/** /**
* store the whether front and backside theme selection is locked to the @p group * store the whether front and backside theme selection is locked to the @p group
* @param group the KConfigGroup to write to from * @param group the KConfigGroup to write to from
* @param allowFixedSize whether front and backside theme selection is locked * @param allowFixedSize whether front and backside theme selection is locked
*/ */
KDEGAMES_EXPORT void writeLockFrontToBackside( KConfigGroup& group, bool lock ); void writeLockFrontToBackside( KConfigGroup& group, bool lock );
} }
#endif #endif
...@@ -23,8 +23,6 @@ ...@@ -23,8 +23,6 @@
#include <kdialog.h> #include <kdialog.h>
#include <kconfig.h> #include <kconfig.h>
#include <libkdegames_export.h>
class QListWidgetItem; class QListWidgetItem;
class KCardWidgetPrivate; class KCardWidgetPrivate;
class KCardWidget; class KCardWidget;
...@@ -52,7 +50,7 @@ class KCardWidget; ...@@ -52,7 +50,7 @@ class KCardWidget;
* \endcode * \endcode
* *
*/ */
class KDEGAMES_EXPORT KCardDialog : public KDialog class KCardDialog : public KDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
...@@ -80,7 +78,7 @@ public: ...@@ -80,7 +78,7 @@ public:
* For an example usage see @ref KCardDialog. * For an example usage see @ref KCardDialog.
* *
*/ */
class KDEGAMES_EXPORT KCardWidget : public QWidget class KCardWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment