[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra/kexi-frameworks7-staniek] kexi: Kexi: Change remaining lowercase includes to <CamelCase>
From: Jaroslaw Staniek <staniek () kde ! org>
Date: 2015-06-30 20:24:31
Message-ID: E1ZA251-0006Ps-4u () scm ! kde ! org
[Download RAW message or body]
Git commit 782fc352db8c91761bb41b3e9293521867826cda by Jaroslaw Staniek.
Committed on 30/06/2015 at 20:16.
Pushed by staniek into branch 'kexi-frameworks7-staniek'.
Kexi: Change remaining lowercase includes to <CamelCase>
(avoid including kdelibs4)
M +1 -1 kexi/formeditor/widgetfactory.cpp
M +1 -1 kexi/migration/importtablewizard.h
M +1 -1 kexi/migration/importwizard.h
M +0 -1 kexi/plugins/forms/kexidbfactorybase.cpp
M +2 -1 kexi/plugins/forms/widgets/kexidbdatepicker.h
M +2 -1 kexi/plugins/forms/widgets/kexidbdoublespinbox.h
M +2 -1 kexi/plugins/forms/widgets/kexidbintspinbox.h
M +2 -0 kexi/plugins/importexport/csv/CMakeLists.txt
M +1 -1 kexi/plugins/importexport/csv/kexicsvexportwizard.h
M +2 -2 kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
M +1 -1 kexi/plugins/importexport/csv/kexicsvimportdialog.h
M +1 -1 kexi/plugins/importexport/csv/kexicsvwidgets.cpp
M +2 -2 kexi/plugins/reports/kexireportview.cpp
M +1 -1 kexi/plugins/scripting/kexiscripting/kexiscriptadaptor.h
M +3 -3 kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
M +1 -1 kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
M +2 -3 kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
M +0 -1 kexi/plugins/shapes/relationdesign/kexirelationdesignshapepl=
ugin.cpp
M +1 -0 kexi/widget/CMakeLists.txt
M +1 -1 kexi/widget/KexiDBPasswordDialog.h
M +1 -1 kexi/widget/KexiPasswordWidget.cpp
M +1 -1 kexi/widget/kexicharencodingcombobox.cpp
M +0 -2 kexi/widget/tableview/kexiinputtableedit.cpp
http://commits.kde.org/calligra/782fc352db8c91761bb41b3e9293521867826cda
diff --git a/kexi/formeditor/widgetfactory.cpp b/kexi/formeditor/widgetfact=
ory.cpp
index ac020fa..e1f2363 100644
--- a/kexi/formeditor/widgetfactory.cpp
+++ b/kexi/formeditor/widgetfactory.cpp
@@ -21,7 +21,7 @@
=
#include "widgetfactory.h"
=
-#include <keditlistwidget.h>
+#include <KEditListWidget>
#include <KLocalizedString>
=
#include "richtextdialog.h"
diff --git a/kexi/migration/importtablewizard.h b/kexi/migration/importtabl=
ewizard.h
index 5a9b08b..4ae62b0 100644
--- a/kexi/migration/importtablewizard.h
+++ b/kexi/migration/importtablewizard.h
@@ -20,7 +20,7 @@
#ifndef IMPORTTABLEWIZARD_H
#define IMPORTTABLEWIZARD_H
=
-#include <kassistantdialog.h>
+#include <KAssistantDialog>
=
#include <QPointer>
=
diff --git a/kexi/migration/importwizard.h b/kexi/migration/importwizard.h
index bea0589..acfa46d 100644
--- a/kexi/migration/importwizard.h
+++ b/kexi/migration/importwizard.h
@@ -26,7 +26,7 @@
=
#include <KDbTristate>
=
-#include <kassistantdialog.h>
+#include <KAssistantDialog>
=
#include <QLabel>
=
diff --git a/kexi/plugins/forms/kexidbfactorybase.cpp b/kexi/plugins/forms/=
kexidbfactorybase.cpp
index 27bf9ae..8bbe448 100644
--- a/kexi/plugins/forms/kexidbfactorybase.cpp
+++ b/kexi/plugins/forms/kexidbfactorybase.cpp
@@ -39,7 +39,6 @@
#include <KDbUtils>
#include <KDbConnection>
=
-#include <kpluginfactory.h>
#include <KLocalizedString>
=
=
diff --git a/kexi/plugins/forms/widgets/kexidbdatepicker.h b/kexi/plugins/f=
orms/widgets/kexidbdatepicker.h
index 0a202bc..e5b3398 100644
--- a/kexi/plugins/forms/widgets/kexidbdatepicker.h
+++ b/kexi/plugins/forms/widgets/kexidbdatepicker.h
@@ -25,7 +25,8 @@
#include "kexiformutils_export.h"
#include <widget/dataviewcommon/kexiformdataiteminterface.h>
#include <formeditor/FormWidgetInterface.h>
-#include <kdatepicker.h>
+
+#include <KDatePicker>
=
//! @short A db-aware DatePicker
class KEXIFORMUTILS_EXPORT KexiDBDatePicker : public KDatePicker,
diff --git a/kexi/plugins/forms/widgets/kexidbdoublespinbox.h b/kexi/plugin=
s/forms/widgets/kexidbdoublespinbox.h
index 185a79d..ca5d012 100644
--- a/kexi/plugins/forms/widgets/kexidbdoublespinbox.h
+++ b/kexi/plugins/forms/widgets/kexidbdoublespinbox.h
@@ -23,7 +23,8 @@
=
#include "kexiformdataiteminterface.h"
#include <formeditor/FormWidgetInterface.h>
-#include <knuminput.h>
+
+#include <QDoubleSpinBox>
=
//! @short A db-aware int spin box
class KEXIFORMUTILS_EXPORT KexiDBDoubleSpinBox : public KDoubleSpinBox,
diff --git a/kexi/plugins/forms/widgets/kexidbintspinbox.h b/kexi/plugins/f=
orms/widgets/kexidbintspinbox.h
index cad182a..9b35151 100644
--- a/kexi/plugins/forms/widgets/kexidbintspinbox.h
+++ b/kexi/plugins/forms/widgets/kexidbintspinbox.h
@@ -23,7 +23,8 @@
=
#include "kexiformdataiteminterface.h"
#include <formeditor/FormWidgetInterface.h>
-#include <knuminput.h>
+
+#include <QSpinBox>
=
//! @short A db-aware int spin box
class KEXIFORMUTILS_EXPORT KexiDBIntSpinBox : public KIntSpinBox,
diff --git a/kexi/plugins/importexport/csv/CMakeLists.txt b/kexi/plugins/im=
portexport/csv/CMakeLists.txt
index e57a0a7..afbdee6 100644
--- a/kexi/plugins/importexport/csv/CMakeLists.txt
+++ b/kexi/plugins/importexport/csv/CMakeLists.txt
@@ -25,6 +25,8 @@ target_link_libraries(kexi_csvimportexportplugin
=
KDb
=
+ KF5::Codecs
+
Qt5::Gui
)
=
diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.h b/kexi/plu=
gins/importexport/csv/kexicsvexportwizard.h
index c544d33..7fcc1e9 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.h
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.h
@@ -23,9 +23,9 @@
=
#include <KConfigGroup>
#include <KSharedConfig>
+#include <KAssistantDialog>
=
#include "kexicsvexport.h"
-#include <kassistantdialog.h>
=
class QCheckBox;
class QGroupBox;
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/p=
lugins/importexport/csv/kexicsvimportdialog.cpp
index d6d17cc..02afed4 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -59,12 +59,12 @@
#include <KDbUtils>
=
#include <KMessageBox>
-#include <kcharsets.h>
-#include <knuminput.h>
+#include <KCharsets>
#include <KLocalizedString>
#include <KConfigGroup>
#include <KGuiItem>
=
+#include <QSpinBox>
#include <QCheckBox>
#include <QClipboard>
#include <QLabel>
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.h b/kexi/plu=
gins/importexport/csv/kexicsvimportdialog.h
index cd6775b..2185c27 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.h
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.h
@@ -37,7 +37,7 @@
#include <QModelIndex>
#include <QElapsedTimer>
=
-#include <kassistantdialog.h>
+#include <KAssistantDialog>
=
#include <KDbTristate>
#include <KDbConnection>
diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp b/kexi/plugin=
s/importexport/csv/kexicsvwidgets.cpp
index 4e66b7d..7fb1c2c 100644
--- a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
@@ -27,7 +27,7 @@
#include <QLineEdit>
=
#include <KIconLoader>
-#include <kio/global.h>
+#include <KIO/Global>
#include <KLocalizedString>
=
#include <kexi_global.h>
diff --git a/kexi/plugins/reports/kexireportview.cpp b/kexi/plugins/reports=
/kexireportview.cpp
index 38e1b3a..3ce0881 100644
--- a/kexi/plugins/reports/kexireportview.cpp
+++ b/kexi/plugins/reports/kexireportview.cpp
@@ -33,8 +33,8 @@
#include <KoReportPreRenderer>
#include "krscriptfunctions.h"
=
-#include <kio/netaccess.h>
-#include <krun.h>
+#include <KIO/NetAccess>
+#include <KRun>
#include <KActionMenu>
#include <KMessageBox>
=
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptadaptor.h b/kex=
i/plugins/scripting/kexiscripting/kexiscriptadaptor.h
index ae50605..5bd7c51 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptadaptor.h
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptadaptor.h
@@ -24,7 +24,7 @@
#include <QMetaObject>
#include <QAction>
=
-#include <kross/core/manager.h>
+#include <Kross/Manager>
=
#include <KDbConnection>
=
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp =
b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
index cb9813f..aa76b39 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
@@ -25,9 +25,9 @@
#include <KexiIcon.h>
#include <KexiMainWindowIface.h>
=
-#include <kross/core/manager.h>
-#include <kross/core/action.h>
-#include <kross/core/interpreter.h>
+#include <Kross/Manager>
+#include <Kross/Action>
+#include <Kross/Interpreter>
=
#include <KDbConnection>
=
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp b/ke=
xi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
index afb2576..e95cf85 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
@@ -22,7 +22,7 @@
=
#include "kexiscripteditor.h"
=
-#include <kross/core/action.h>
+#include <Kross/Action>
=
/// \internal d-pointer class
class KexiScriptEditor::Private
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp b/kexi=
/plugins/scripting/kexiscripting/kexiscriptpart.cpp
index 5456881..28f2540 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
@@ -30,9 +30,8 @@
#include <KexiMainWindowIface.h>
#include <kexiproject.h>
=
-#include <kross/core/manager.h>
-#include <kross/core/action.h>
-#include <kross/core/actioncollection.h>
+#include <Kross/Manager>
+#include <Kross/ActionCollection>
=
#include <KConfig>
#include <KConfigGroup>
diff --git a/kexi/plugins/shapes/relationdesign/kexirelationdesignshapeplug=
in.cpp b/kexi/plugins/shapes/relationdesign/kexirelationdesignshapeplugin.c=
pp
index 075b232..e9c90cb 100644
--- a/kexi/plugins/shapes/relationdesign/kexirelationdesignshapeplugin.cpp
+++ b/kexi/plugins/shapes/relationdesign/kexirelationdesignshapeplugin.cpp
@@ -20,7 +20,6 @@
#include "kexirelationdesignfactory.h"
#include "kexirelationdesigntoolfactory.h"
#include <KoShapeRegistry.h>
-#include <kpluginfactory.h>
#include <KoToolRegistry.h>
=
K_PLUGIN_FACTORY(KexiRelationDesignShapePluginFactory, registerPlugin<Kexi=
RelationDesignShapePlugin>();)
diff --git a/kexi/widget/CMakeLists.txt b/kexi/widget/CMakeLists.txt
index 3ed0682..2d20bbb 100644
--- a/kexi/widget/CMakeLists.txt
+++ b/kexi/widget/CMakeLists.txt
@@ -95,6 +95,7 @@ target_link_libraries(kexiextendedwidgets
KF5::TextWidgets # KTextEdit
KF5::KIOFileWidgets # KFileWidget
KF5::TextEditor
+ KF5::Codecs # KCharsets
)
=
set_target_properties(kexiextendedwidgets PROPERTIES VERSION ${GENERIC_CAL=
LIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} )
diff --git a/kexi/widget/KexiDBPasswordDialog.h b/kexi/widget/KexiDBPasswor=
dDialog.h
index ee850b6..8d8e479 100644
--- a/kexi/widget/KexiDBPasswordDialog.h
+++ b/kexi/widget/KexiDBPasswordDialog.h
@@ -24,7 +24,7 @@
=
#include <KDbTristate>
=
-#include <kpassworddialog.h>
+#include <KPasswordDialog>
=
class KDbConnectionData;
class KexiProjectData;
diff --git a/kexi/widget/KexiPasswordWidget.cpp b/kexi/widget/KexiPasswordW=
idget.cpp
index f08a2a7..70997a3 100644
--- a/kexi/widget/KexiPasswordWidget.cpp
+++ b/kexi/widget/KexiPasswordWidget.cpp
@@ -32,7 +32,7 @@
=
#include <KComboBox>
#include <KIconLoader>
-#include <ktitlewidget.h>
+#include <KTitleWidget>
=
#include "ui_KexiPasswordWidget.h"
=
diff --git a/kexi/widget/kexicharencodingcombobox.cpp b/kexi/widget/kexicha=
rencodingcombobox.cpp
index 8cff67d..5bcd646 100644
--- a/kexi/widget/kexicharencodingcombobox.cpp
+++ b/kexi/widget/kexicharencodingcombobox.cpp
@@ -20,7 +20,7 @@
#include "kexicharencodingcombobox.h"
#include <kexiutils/utils.h>
=
-#include <kcharsets.h>
+#include <KCharsets>
#include <KLocalizedString>
=
#include <QTextCodec>
diff --git a/kexi/widget/tableview/kexiinputtableedit.cpp b/kexi/widget/tab=
leview/kexiinputtableedit.cpp
index d715f5c..f9e348c 100644
--- a/kexi/widget/tableview/kexiinputtableedit.cpp
+++ b/kexi/widget/tableview/kexiinputtableedit.cpp
@@ -26,8 +26,6 @@
#include <KDbLongLongValidator>
=
#include <KColorScheme>
-#include <kcompletionbox.h>
-#include <knumvalidator.h>
=
#include <QPainter>
#include <QApplication>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic