From b6d71f3cbf6add1926a3441831c5e2b903aec805 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 22 Feb 2015 10:49:29 +0100 Subject: [PATCH] --pedantic; --- CMakeLists.txt | 2 +- src/danbooruconnectwidget.cpp | 2 +- src/libdanbooru/danbooru.h | 2 +- src/libdanbooru/danboorupool.h | 2 +- src/libdanbooru/danboorupost.h | 2 +- src/libdanbooru/danbooruservice.h | 3 +-- src/libdanbooru/danboorutag.cpp | 2 +- src/libdanbooru/danboorutag.h | 2 +- src/mainwindow.cpp | 1 - src/model/danboorupostmodel.cpp | 2 +- src/model/danboorupostmodel.h | 2 +- 11 files changed, 10 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ffdfa5c..a3d9eed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ include(KDECompilerSettings) include(KDECMakeSettings) include(FeatureSummary) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -pedantic") set(CMAKE_INCLUDE_CURRENT_DIR ON) #add_subdirectory( doc ) diff --git a/src/danbooruconnectwidget.cpp b/src/danbooruconnectwidget.cpp index a4f5eb6..820ba12 100644 --- a/src/danbooruconnectwidget.cpp +++ b/src/danbooruconnectwidget.cpp @@ -218,4 +218,4 @@ bool DanbooruConnectWidget::isAnonymous() const { } -}; // namespace Danbooru +} // namespace Danbooru diff --git a/src/libdanbooru/danbooru.h b/src/libdanbooru/danbooru.h index 987a675..f0f0b04 100644 --- a/src/libdanbooru/danbooru.h +++ b/src/libdanbooru/danbooru.h @@ -32,6 +32,6 @@ namespace Danbooru { -}; // namespace Danbooru +} // namespace Danbooru #endif // DANBOORU_H diff --git a/src/libdanbooru/danboorupool.h b/src/libdanbooru/danboorupool.h index 6527a9a..bbf1bcc 100644 --- a/src/libdanbooru/danboorupool.h +++ b/src/libdanbooru/danboorupool.h @@ -102,7 +102,7 @@ public: void addPosts(const QStringList &posts); }; -}; // namespace Danbooru +} // namespace Danbooru Q_DECLARE_METATYPE(Danbooru::DanbooruPool*) diff --git a/src/libdanbooru/danboorupost.h b/src/libdanbooru/danboorupost.h index 4464130..68f08cd 100644 --- a/src/libdanbooru/danboorupost.h +++ b/src/libdanbooru/danboorupost.h @@ -217,7 +217,7 @@ public: Q_DECLARE_OPERATORS_FOR_FLAGS(DanbooruPost::Ratings) -}; // namespace Danbooru +} // namespace Danbooru Q_DECLARE_METATYPE(Danbooru::DanbooruPost *) Q_DECLARE_METATYPE(Danbooru::DanbooruPost::Rating) diff --git a/src/libdanbooru/danbooruservice.h b/src/libdanbooru/danbooruservice.h index 4f5dffc..7cce6ae 100644 --- a/src/libdanbooru/danbooruservice.h +++ b/src/libdanbooru/danbooruservice.h @@ -125,7 +125,6 @@ public: int currentPage() const; - /** * @brief Get posts from a the board. * @@ -334,5 +333,5 @@ Q_SIGNALS: void tagDownloaded(Danbooru::DanbooruTag *tag); }; -}; +} #endif // DANBOORUSERVICE_H diff --git a/src/libdanbooru/danboorutag.cpp b/src/libdanbooru/danboorutag.cpp index dff3552..2afb9ed 100644 --- a/src/libdanbooru/danboorutag.cpp +++ b/src/libdanbooru/danboorutag.cpp @@ -84,4 +84,4 @@ Danbooru::DanbooruTag::TagType DanbooruTag::type() const return m_tagType; } -}; // namespace Danbooru +} // namespace Danbooru diff --git a/src/libdanbooru/danboorutag.h b/src/libdanbooru/danboorutag.h index e3c56a4..701f1fa 100644 --- a/src/libdanbooru/danboorutag.h +++ b/src/libdanbooru/danboorutag.h @@ -74,7 +74,7 @@ public: Q_DECLARE_FLAGS(TagTypes, DanbooruTag::TagType) Q_DECLARE_OPERATORS_FOR_FLAGS(TagTypes) -}; // namespace Danbooru +} // namespace Danbooru Q_DECLARE_METATYPE(Danbooru::DanbooruTag *) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 36504de..e775b28 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -215,7 +215,6 @@ DanbooruMainWindow::DanbooruMainWindow(QWidget *parent) DanbooruMainWindow::~DanbooruMainWindow() { - disconnect(m_service, &DanbooruService::postDownloadFinished, this, 0); } void DanbooruMainWindow::loadSettings() diff --git a/src/model/danboorupostmodel.cpp b/src/model/danboorupostmodel.cpp index c7073c1..32c1799 100644 --- a/src/model/danboorupostmodel.cpp +++ b/src/model/danboorupostmodel.cpp @@ -153,4 +153,4 @@ QStringList DanbooruPostModel::postTags() const } -}; +} // namespace Danbooru diff --git a/src/model/danboorupostmodel.h b/src/model/danboorupostmodel.h index 51b77b8..c597f6e 100644 --- a/src/model/danboorupostmodel.h +++ b/src/model/danboorupostmodel.h @@ -86,6 +86,6 @@ public Q_SLOTS: void addPost(Danbooru::DanbooruPost *post); }; -}; // namespace Danbooru +} // namespace Danbooru #endif // DANBOORUPOSTMODEL_H