aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Mi <codeminister@publicstatic.de>2014-01-19 17:27:50 (GMT)
committerGregor Mi <codeminister@publicstatic.de>2014-01-19 17:27:50 (GMT)
commit3e0f2b1fb01a727aa7f04a02c9fcec04ac9c864a (patch)
tree965fb0fe8a37db3b211e50dd1c3dcfbb7c4b046b
parent43e238d2028c6a8e7b4e6ca42878356c81c95009 (diff)
remove KDE4Support
-rw-r--r--CMakeLists.txt1
-rw-r--r--libksane/ksane_find_devices_thread.h2
-rw-r--r--libksane/ksane_preview_thread.cpp2
-rw-r--r--libksane/ksane_scan_thread.cpp2
-rw-r--r--libksane/ksane_scan_thread.h2
-rw-r--r--libksane/ksane_widget.cpp2
-rw-r--r--libksane/ksane_widget.h2
-rw-r--r--libksane/ksane_widget_private.h2
-rw-r--r--libksane/options/ksane_opt_slider.cpp2
-rw-r--r--libksane/options/ksane_option.cpp2
-rw-r--r--libksane/options/ksane_option.h2
-rw-r--r--libksane/splittercollapser.cpp2
-rw-r--r--libksane/widgets/labeled_checkbox.cpp6
-rw-r--r--libksane/widgets/labeled_slider.cpp2
-rw-r--r--libksane/widgets/labeled_slider.h2
15 files changed, 14 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e7b4f4..2cac096 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,7 +48,6 @@ find_package(KF5PrintUtils ${KF5_VERSION} REQUIRED)
find_package(KF5XmlGui ${KF5_VERSION} REQUIRED)
#find_package(KF5Notifications ${KF5_VERSION} REQUIRED)
find_package(KF5Wallet ${KF5_VERSION} REQUIRED)
-find_package(KF5KDE4Support ${KF5_VERSION} REQUIRED)
# Check if sane API is available.
if (NOT WIN32)
diff --git a/libksane/ksane_find_devices_thread.h b/libksane/ksane_find_devices_thread.h
index 4e46068..9ae5d65 100644
--- a/libksane/ksane_find_devices_thread.h
+++ b/libksane/ksane_find_devices_thread.h
@@ -6,7 +6,7 @@
* Description : Sane interface for KDE
*
* Copyright (C) 2007-2008 by Kare Sars <kare dot sars at iki dot fi>
- * 2014: Gregor Mitsch: port to KDE5 frameworks
+ * Copyright (C) 2014 by Gregor Mitsch: port to KDE5 frameworks
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/libksane/ksane_preview_thread.cpp b/libksane/ksane_preview_thread.cpp
index 765d300..ad385ff 100644
--- a/libksane/ksane_preview_thread.cpp
+++ b/libksane/ksane_preview_thread.cpp
@@ -6,7 +6,7 @@
* Description : Sane interface for KDE
*
* Copyright (C) 2009 by Kare Sars <kare dot sars at iki dot fi>
-* 2014: Gregor Mitsch: port to KDE5 frameworks
+* Copyright (C) 2014 by Gregor Mitsch: port to KDE5 frameworks
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/libksane/ksane_scan_thread.cpp b/libksane/ksane_scan_thread.cpp
index 83423df..151b7f9 100644
--- a/libksane/ksane_scan_thread.cpp
+++ b/libksane/ksane_scan_thread.cpp
@@ -6,7 +6,7 @@
* Description : Sane interface for KDE
*
* Copyright (C) 2009 by Kare Sars <kare dot sars at iki dot fi>
-* 2014: Gregor Mitsch: port to KDE5 frameworks
+* Copyright (C) 2014 by Gregor Mitsch: port to KDE5 frameworks
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/libksane/ksane_scan_thread.h b/libksane/ksane_scan_thread.h
index 6d8a016..4eed519 100644
--- a/libksane/ksane_scan_thread.h
+++ b/libksane/ksane_scan_thread.h
@@ -6,7 +6,7 @@
* Description : Sane interface for KDE
*
* Copyright (C) 2009 by Kare Sars <kare dot sars at iki dot fi>
- * 2014: Gregor Mitsch: port to KDE5 frameworks
+ * Copyright (C) 2014 by Gregor Mitsch: port to KDE5 frameworks
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/libksane/ksane_widget.cpp b/libksane/ksane_widget.cpp
index 4650d75..7fd1984 100644
--- a/libksane/ksane_widget.cpp
+++ b/libksane/ksane_widget.cpp
@@ -9,7 +9,7 @@
* Copyright (C) 2009 by Matthias Nagl <matthias at nagl dot info>
* Copyright (C) 2009 by Grzegorz Kurtyka <grzegorz dot kurtyka at gmail dot com>
* Copyright (C) 2007-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
- * 2014: Gregor Mitsch: port to KDE5 frameworks
+ * Copyright (C) 2014 by Gregor Mitsch: port to KDE5 frameworks
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/libksane/ksane_widget.h b/libksane/ksane_widget.h
index 27f509e..dcf4d8f 100644
--- a/libksane/ksane_widget.h
+++ b/libksane/ksane_widget.h
@@ -7,7 +7,7 @@
*
* Copyright (C) 2007-2010 by Kare Sars <kare dot sars at iki dot fi>
* Copyright (C) 2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
- * 2014: Gregor Mitsch: port to KDE5 frameworks
+ * Copyright (C) 2014 by Gregor Mitsch: port to KDE5 frameworks
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/libksane/ksane_widget_private.h b/libksane/ksane_widget_private.h
index f097f43..27b16f5 100644
--- a/libksane/ksane_widget_private.h
+++ b/libksane/ksane_widget_private.h
@@ -6,7 +6,7 @@
* Description : Sane interface for KDE
*
* Copyright (C) 2009 by Kare Sars <kare dot sars at iki dot fi>
- * 2014: Gregor Mitsch: port to KDE5 frameworks
+ * Copyright (C) 2014 by Gregor Mitsch: port to KDE5 frameworks
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/libksane/options/ksane_opt_slider.cpp b/libksane/options/ksane_opt_slider.cpp
index 306748c..f80e7e0 100644
--- a/libksane/options/ksane_opt_slider.cpp
+++ b/libksane/options/ksane_opt_slider.cpp
@@ -6,7 +6,7 @@
* Description : Sane interface for KDE
*
* Copyright (C) 2009 by Kare Sars <kare dot sars at iki dot fi>
- * 2014: Gregor Mitsch: port to KDE5 frameworks
+ * Copyright (C) 2014 by Gregor Mitsch: port to KDE5 frameworks
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/libksane/options/ksane_option.cpp b/libksane/options/ksane_option.cpp
index 306d997..a63affb 100644
--- a/libksane/options/ksane_option.cpp
+++ b/libksane/options/ksane_option.cpp
@@ -6,7 +6,7 @@
* Description : Sane interface for KDE
*
* Copyright (C) 2009 by Kare Sars <kare dot sars at iki dot fi>
- * 2014: Gregor Mitsch: port to KDE5 frameworks
+ * Copyright (C) 2014 by Gregor Mitsch: port to KDE5 frameworks
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/libksane/options/ksane_option.h b/libksane/options/ksane_option.h
index f46add0..51e8422 100644
--- a/libksane/options/ksane_option.h
+++ b/libksane/options/ksane_option.h
@@ -6,7 +6,7 @@
* Description : Sane interface for KDE
*
* Copyright (C) 2009 by Kare Sars <kare dot sars at iki dot fi>
- * 2014: Gregor Mitsch: port to KDE5 frameworks
+ * Copyright (C) 2014 by Gregor Mitsch: port to KDE5 frameworks
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/libksane/splittercollapser.cpp b/libksane/splittercollapser.cpp
index b03c9fc..e4395d0 100644
--- a/libksane/splittercollapser.cpp
+++ b/libksane/splittercollapser.cpp
@@ -3,7 +3,7 @@
Gwenview: an image viewer
Copyright 2009 Aurélien Gâteau <agateau@kde.org>
Copyright 2009 Kåre Sårs <kare.sars@iki.fi>
-2014: Gregor Mitsch: port to KDE5 frameworks
+Copyright (C) 2014 by Gregor Mitsch: port to KDE5 frameworks
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
diff --git a/libksane/widgets/labeled_checkbox.cpp b/libksane/widgets/labeled_checkbox.cpp
index d8086f4..aa5d4dc 100644
--- a/libksane/widgets/labeled_checkbox.cpp
+++ b/libksane/widgets/labeled_checkbox.cpp
@@ -6,6 +6,7 @@
* Description : Sane interface for KDE
*
* Copyright (C) 2007-2011 by Kare Sars <kare.sars@iki .fi>
+ * Copyright (C) 2014 by Gregor Mitsch: port to KDE5 frameworks
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -25,12 +26,7 @@
*
* ============================================================ */
-// Local includes
#include "labeled_checkbox.h"
-#include "labeled_checkbox.moc"
-
-// Qt includes
-#include <KDebug>
namespace KSaneIface
{
diff --git a/libksane/widgets/labeled_slider.cpp b/libksane/widgets/labeled_slider.cpp
index 15c8c03..014c147 100644
--- a/libksane/widgets/labeled_slider.cpp
+++ b/libksane/widgets/labeled_slider.cpp
@@ -6,7 +6,7 @@
* Description : Sane interface for KDE
*
* Copyright (C) 2007-2011 by Kare Sars <kare.sars@iki .fi>
- * 2014: Gregor Mitsch: port to KDE5 frameworks
+ * Copyright (C) 2014 by Gregor Mitsch: port to KDE5 frameworks
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/libksane/widgets/labeled_slider.h b/libksane/widgets/labeled_slider.h
index e7bea31..0f982ea 100644
--- a/libksane/widgets/labeled_slider.h
+++ b/libksane/widgets/labeled_slider.h
@@ -6,7 +6,7 @@
* Description : Sane interface for KDE
*
* Copyright (C) 2007-2011 by Kare Sars <kare.sars@iki .fi>
- * 2014: Gregor Mitsch: port to KDE5 frameworks
+ * Copyright (C) 2014 by Gregor Mitsch: port to KDE5 frameworks
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public