Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Games
KShisen
Commits
fe1abcb8
Commit
fe1abcb8
authored
Dec 31, 2015
by
Frederik Schwarzer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Includes cleanup.
parent
17ddbb42
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
76 additions
and
45 deletions
+76
-45
src/app.cpp
src/app.cpp
+29
-20
src/app.h
src/app.h
+5
-1
src/board.cpp
src/board.cpp
+12
-7
src/board.h
src/board.h
+16
-10
src/kshisen_debug.cpp
src/kshisen_debug.cpp
+2
-1
src/kshisen_debug.h
src/kshisen_debug.h
+3
-1
src/main.cpp
src/main.cpp
+9
-5
No files found.
src/app.cpp
View file @
fe1abcb8
...
...
@@ -19,34 +19,43 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
// own
#include "app.h"
#include "board.h"
#include "prefs.h"
#include "ui_settings.h"
#include "kshisen_debug.h"
#include <kmahjonggconfigdialog.h>
#include <highscore/kscoredialog.h>
#include <kstandardgameaction.h>
#include <kactioncollection.h>
#include <kconfig.h>
#include <kconfigdialog.h>
#include <klineedit.h>
#include <KLocalizedString>
#include <kmessagebox.h>
#include <kseparator.h>
#include <kshortcutsdialog.h>
#include <kstandardaction.h>
#include <kstandardguiitem.h>
#include <ktoggleaction.h>
// STL
#include <cmath>
// Qt
#include <QIcon>
#include <QPointer>
#include <QStatusBar>
#include <QTimer>
#include <cmath>
// KDE
#include <KStandardGameAction>
#include <KActionCollection>
#include <KConfig>
#include <KConfigDialog>
#include <KLineEdit>
#include <KLocalizedString>
#include <KMessageBox>
#include <KSeparator>
#include <KShortcutsDialog>
#include <KStandardAction>
#include <KStandardGuiItem>
#include <KToggleAction>
// KDEGames
#include <highscore/kscoredialog.h>
// Kmahjongg
#include <kmahjonggconfigdialog.h>
// KShisen
#include "board.h"
#include "kshisen_debug.h"
#include "prefs.h"
#include "ui_settings.h"
/**
...
...
src/app.h
View file @
fe1abcb8
...
...
@@ -21,12 +21,16 @@
#ifndef APP_H
#define APP_H
#include <kxmlguiwindow.h>
// KDE
#include <KXmlGuiWindow>
// Qt
class
QLabel
;
// KShisen
class
Board
;
/**
* @brief Class holding the application and its functions
*/
...
...
src/board.cpp
View file @
fe1abcb8
...
...
@@ -19,21 +19,26 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
// own
#include "board.h"
#include "prefs.h"
#include <KLocalizedString>
// STL
#include <algorithm>
#include <array>
#include "kshisen_debug.h"
// Qt
#include <QMouseEvent>
#include <QPainter>
#include <QStandardPaths>
#include <QTimer>
#include <QStandardPaths>
// KDE
#include <KLocalizedString>
// KShisen
#include "kshisen_debug.h"
#include "prefs.h"
#include <algorithm>
#include <array>
#define EMPTY 0
#define SEASONS_START 28
...
...
src/board.h
View file @
fe1abcb8
...
...
@@ -24,22 +24,28 @@
#ifndef BOARD_H
#define BOARD_H
#include "debug.h"
// STL
#include <vector>
// Qt
#include <QList>
#include <QSize>
#include <QWidget>
// KDE
#include <KRandomSequence>
// KDEGames
#include <KgSound>
#include <KGameClock>
#include <kgameclock.h>
#include <kmahjonggtileset.h>
// KMahjongg
#include <kmahjonggbackground.h>
#include <kmahjonggtileset.h>
#include <krandomsequence.h>
// KShisen
#include "debug.h"
#include "kshisen_debug.h"
#include <QList>
#include <QSize>
#include <QWidget>
#include <vector>
using
TilePos
=
QPoint
;
...
...
src/kshisen_debug.cpp
View file @
fe1abcb8
...
...
@@ -17,7 +17,8 @@
Boston, MA 02110-1301, USA.
*/
// KShisen
#include "kshisen_debug.h"
Q_LOGGING_CATEGORY
(
KSHISEN_LOG
,
"log_kshisen"
)
Q_LOGGING_CATEGORY
(
KSHISEN_LOG
,
"log_kshisen"
)
src/kshisen_debug.h
View file @
fe1abcb8
...
...
@@ -20,8 +20,10 @@
#ifndef KSHISEN_DEBUG_H
#define KSHISEN_DEBUG_H
// Qt
#include <QLoggingCategory>
Q_DECLARE_LOGGING_CATEGORY
(
KSHISEN_LOG
)
#endif
src/main.cpp
View file @
fe1abcb8
...
...
@@ -18,15 +18,19 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
#include "app.h"
// Qt
#include <QApplication>
#include <QCommandLineParser>
// KDE
#include <KAboutData>
#include <KDBusService>
#include <Kdelibs4ConfigMigrator>
#include <QCommandLineParser>
#include <QApplication>
#include <KLocalizedString>
#include <KDBusService>
// KShisen
#include "app.h"
static
const
char
description
[]
=
I18N_NOOP
(
"A KDE game similar to Mahjongg"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment