[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kexi] src: Fix minor EBN issues
From: Yuri Chornoivan <null () kde ! org>
Date: 2018-09-02 10:28:55
Message-ID: E1fwPcl-0007oX-G9 () code ! kde ! org
[Download RAW message or body]
Git commit f98c5580bcee4a1c032038f4569f50130cc52024 by Yuri Chornoivan.
Committed on 02/09/2018 at 10:27.
Pushed by yurchor into branch 'master'.
Fix minor EBN issues
M +1 -1 src/core/KexiWindow.h
M +2 -2 src/core/kexidbconnectionset.h
M +2 -2 src/core/kexipartinfo_p.h
M +2 -2 src/core/kexisearchandreplaceiface.h
M +1 -1 src/core/kexistaticpart.cpp
M +2 -2 src/core/kexitemplateloader.h
M +2 -2 src/core/kexitextmsghandler.h
M +2 -2 src/formeditor/FormWidgetInterface.h
M +0 -1 src/formeditor/formIO.h
M +2 -2 src/formeditor/richtextdialog.h
M +2 -2 src/formeditor/tabstopdialog.h
M +2 -2 src/kexiutils/FontSettings_p.h
M +2 -2 src/kexiutils/InternalPropertyMap.h
M +2 -5 src/main/KexiMenuWidget.cpp
M +0 -2 src/main/startup/KexiRecentProjectsModel.cpp
M +2 -2 src/migration/importoptionsdlg.h
M +0 -1 src/migration/importtablewizard.cpp
M +1 -1 src/migration/mdb/3rdparty/mdbtools/libmdb/money.c
M +2 -2 src/migration/migratemanager.h
M +2 -2 src/mobile/KexiMobileWidget.h
M +2 -2 src/plugins/forms/widgets/kexidbutils.h
M +2 -2 src/plugins/forms/widgets/main/KexiStandardContainerFormWidgets.h
M +0 -3 src/plugins/forms/widgets/webbrowser/WebBrowserWidget.cpp
M +2 -2 src/plugins/importexport/csv/KexiCsvImportExportPlugin.h
M +2 -2 src/plugins/importexport/csv/kexicsvimportoptionsdlg.h
M +2 -2 src/plugins/scripting/kexiscripting/KexiScriptingDebug.h
M +2 -2 src/plugins/tables/kexitabledesignerview.h
M +2 -2 src/plugins/tables/kexitabledesignerview_p.h
M +0 -1 src/plugins/tables/kexitablepart.cpp
M +2 -2 src/widget/dataviewcommon/kexidataawareobjectiface.h
M +2 -2 src/widget/dataviewcommon/kexidataprovider.h
M +2 -2 src/widget/properties/KexiCustomPropertyFactory.h
M +2 -2 src/widget/properties/KexiCustomPropertyFactory_p.h
M +1 -1 src/widget/relations/KexiRelationsView.h
M +0 -1 src/widget/tableview/KexiDataTableScrollArea.cpp
M +0 -1 src/widget/tableview/KexiTableScrollArea.cpp
M +2 -2 src/widget/tableview/KexiTableScrollArea_p.h
M +2 -2 src/widget/utils/kexidisplayutils.h
https://commits.kde.org/kexi/f98c5580bcee4a1c032038f4569f50130cc52024
diff --git a/src/core/KexiWindow.h b/src/core/KexiWindow.h
index 384bde96b..460ab716f 100644
--- a/src/core/KexiWindow.h
+++ b/src/core/KexiWindow.h
@@ -301,7 +301,7 @@ private:
//! Closes the window and all views. If @a force is true, attempts to close \
every
//! view even if one of them refuses to close. If @a force is false, false is \
returned //! as soon as first view refuses to close.
- //! @return true on sucessfull close; forced close always returns true
+ //! @return true on successful close; forced close always returns true
bool close(bool force = false);
void createSubwidgets();
diff --git a/src/core/kexidbconnectionset.h b/src/core/kexidbconnectionset.h
index 1785756c0..2c33aaa3c 100644
--- a/src/core/kexidbconnectionset.h
+++ b/src/core/kexidbconnectionset.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXIDBCONNSET_H
-#define KEXIDBCONNSET_H
+#ifndef KEXIDBCONNECTIONSET_H
+#define KEXIDBCONNECTIONSET_H
#include "kexicore_export.h"
diff --git a/src/core/kexipartinfo_p.h b/src/core/kexipartinfo_p.h
index 50949c51f..794214ed2 100644
--- a/src/core/kexipartinfo_p.h
+++ b/src/core/kexipartinfo_p.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXIPROJECTPARTITEM_P_H
-#define KEXIPROJECTPARTITEM_P_H
+#ifndef KEXIPARTINFO_P_H
+#define KEXIPARTINFO_P_H
#include "kexipartinfo.h"
diff --git a/src/core/kexisearchandreplaceiface.h \
b/src/core/kexisearchandreplaceiface.h index a283d0ee0..498dc5520 100644
--- a/src/core/kexisearchandreplaceiface.h
+++ b/src/core/kexisearchandreplaceiface.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXISEARCHANDREPLACEVIEWINTERFACE_H
-#define KEXISEARCHANDREPLACEVIEWINTERFACE_H
+#ifndef KEXISEARCHANDREPLACEIFACE_H
+#define KEXISEARCHANDREPLACEIFACE_H
#include "kexicore_export.h"
diff --git a/src/core/kexistaticpart.cpp b/src/core/kexistaticpart.cpp
index 3a76c9f5d..781bed748 100644
--- a/src/core/kexistaticpart.cpp
+++ b/src/core/kexistaticpart.cpp
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#include "kexipartmanager.h"
#include "kexistaticpart.h"
+#include "kexipartmanager.h"
#include "kexipartinfo_p.h"
#include "kexipartitem.h"
#include "kexi.h"
diff --git a/src/core/kexitemplateloader.h b/src/core/kexitemplateloader.h
index 330f9bc90..3f20d7a4a 100644
--- a/src/core/kexitemplateloader.h
+++ b/src/core/kexitemplateloader.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXI_TEMPLLOADER_H
-#define KEXI_TEMPLLOADER_H
+#ifndef KEXI_TEMPLATELOADER_H
+#define KEXI_TEMPLATELOADER_H
#include "kexiprojectdata.h"
diff --git a/src/core/kexitextmsghandler.h b/src/core/kexitextmsghandler.h
index f672c285c..14db90259 100644
--- a/src/core/kexitextmsghandler.h
+++ b/src/core/kexitextmsghandler.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXITXTMSGHANDLER_H
-#define KEXITXTMSGHANDLER_H
+#ifndef KEXITEXTMSGHANDLER_H
+#define KEXITEXTMSGHANDLER_H
#include "kexiguimsghandler.h"
diff --git a/src/formeditor/FormWidgetInterface.h \
b/src/formeditor/FormWidgetInterface.h index bf8d29ca0..42535fb2a 100644
--- a/src/formeditor/FormWidgetInterface.h
+++ b/src/formeditor/FormWidgetInterface.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KFORMDESIGNERFORMWIDGETIFACE_H
-#define KFORMDESIGNERFORMWIDGETIFACE_H
+#ifndef FORM_WIDGET_INTERFACE_H
+#define FORM_WIDGET_INTERFACE_H
#include "kformdesigner_export.h"
diff --git a/src/formeditor/formIO.h b/src/formeditor/formIO.h
index 89f136e9d..d3882966b 100644
--- a/src/formeditor/formIO.h
+++ b/src/formeditor/formIO.h
@@ -27,7 +27,6 @@
#include <QPixmap>
#include <QLabel>
#include <QPaintEvent>
-#include <QLabel>
class QString;
class QDomElement;
diff --git a/src/formeditor/richtextdialog.h b/src/formeditor/richtextdialog.h
index ff3497247..78c75722d 100644
--- a/src/formeditor/richtextdialog.h
+++ b/src/formeditor/richtextdialog.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef RICHTEXTEDIT_DIALOG_H
-#define RICHTEXTEDIT_DIALOG_H
+#ifndef RICHTEXT_DIALOG_H
+#define RICHTEXT_DIALOG_H
#include "kformdesigner_export.h"
diff --git a/src/formeditor/tabstopdialog.h b/src/formeditor/tabstopdialog.h
index c37123204..dfc6ea63f 100644
--- a/src/formeditor/tabstopdialog.h
+++ b/src/formeditor/tabstopdialog.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef TABSTOPEDIT_DIALOG_H
-#define TABSTOPEDIT_DIALOG_H
+#ifndef TABSTOP_DIALOG_H
+#define TABSTOP_DIALOG_H
#include "kformdesigner_export.h"
diff --git a/src/kexiutils/FontSettings_p.h b/src/kexiutils/FontSettings_p.h
index 4c2b02119..4cfc5425e 100644
--- a/src/kexiutils/FontSettings_p.h
+++ b/src/kexiutils/FontSettings_p.h
@@ -22,8 +22,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXIUTILS_FONTSETTINGS_H
-#define KEXIUTILS_FONTSETTINGS_H
+#ifndef KEXIUTILS_FONTSETTINGS_P_H
+#define KEXIUTILS_FONTSETTINGS_P_H
#include <QFont>
#include <KSharedConfig>
diff --git a/src/kexiutils/InternalPropertyMap.h \
b/src/kexiutils/InternalPropertyMap.h index 17f59c96a..db1cc40a5 100644
--- a/src/kexiutils/InternalPropertyMap.h
+++ b/src/kexiutils/InternalPropertyMap.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXI_UTILS_PROPERTYMAP_H
-#define KEXI_UTILS_PROPERTYMAP_H
+#ifndef KEXI_UTILS_INTERNALPROPERTYMAP_H
+#define KEXI_UTILS_INTERNALPROPERTYMAP_H
#include "kexiutils_export.h"
#include <QVariant>
diff --git a/src/main/KexiMenuWidget.cpp b/src/main/KexiMenuWidget.cpp
index d491c5aa8..ffca89a18 100644
--- a/src/main/KexiMenuWidget.cpp
+++ b/src/main/KexiMenuWidget.cpp
@@ -29,6 +29,7 @@
*/
#include "KexiMenuWidget.h"
+#include "KexiMenuWidget_p.h"
#include <KColorScheme>
#include <KColorUtils>
#include <KIconLoader>
@@ -62,10 +63,6 @@
# include <QWhatsThis>
#endif
-#include <KColorScheme>
-
-#include "KexiMenuWidget_p.h"
-
const int calligraLogoPixmapInternalWidth = 100;
const int calligraLogoPixmapInternalHeight = 71;
const char calligraUrl[] = "https://www.calligra.org";
@@ -2154,7 +2151,7 @@ int KexiMenuWidgetPrivate::bottomOfLastItem() const
return actionRects.last().bottom();
}
-/* Logo's pixmap is consisted of logo and some glow (cutted-off vertically).
+/* Logo's pixmap is consisted of logo and some glow (cut-off vertically).
(without the glow the math would be simpler)
+--------+ +
| glow | |--- glowHeight - cutOffGlow
diff --git a/src/main/startup/KexiRecentProjectsModel.cpp \
b/src/main/startup/KexiRecentProjectsModel.cpp index 44ad1cbbc..99807565a 100644
--- a/src/main/startup/KexiRecentProjectsModel.cpp
+++ b/src/main/startup/KexiRecentProjectsModel.cpp
@@ -32,8 +32,6 @@
#include <QFileInfo>
#include <QDebug>
-#include <QFileInfo>
-
KexiRecentProjectsModel::KexiRecentProjectsModel(
const KexiRecentProjects& projects, QObject *parent)
: QAbstractListModel(parent), m_projects(&projects)
diff --git a/src/migration/importoptionsdlg.h b/src/migration/importoptionsdlg.h
index df592a815..b0b8092f5 100644
--- a/src/migration/importoptionsdlg.h
+++ b/src/migration/importoptionsdlg.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXIMIGRATIONOPTIONSDIALOG_H
-#define KEXIMIGRATIONOPTIONSDIALOG_H
+#ifndef KEXIMIGRATION_IMPORT_OPTIONSDLG_H
+#define KEXIMIGRATION_IMPORT_OPTIONSDLG_H
#include <QDialog>
diff --git a/src/migration/importtablewizard.cpp \
b/src/migration/importtablewizard.cpp index 3336dbc1f..a2d1ee507 100644
--- a/src/migration/importtablewizard.cpp
+++ b/src/migration/importtablewizard.cpp
@@ -43,7 +43,6 @@
#include <KDbConnectionData>
#include <KDbDriver>
#include <KDbDriverManager>
-#include <KDbDriverManager>
#include <KDbSqlResult>
#include <KDbTransactionGuard>
#include <KDbUtils>
diff --git a/src/migration/mdb/3rdparty/mdbtools/libmdb/money.c \
b/src/migration/mdb/3rdparty/mdbtools/libmdb/money.c index eaea04ae3..78979bffe \
100644
--- a/src/migration/mdb/3rdparty/mdbtools/libmdb/money.c
+++ b/src/migration/mdb/3rdparty/mdbtools/libmdb/money.c
@@ -26,7 +26,7 @@
#define MAX_NUMERIC_PRECISION 28
/*
** these routines are copied from the freetds project which does something
-** very similiar
+** very similar
*/
static int multiply_byte(unsigned char *product, int num, unsigned char \
*multiplier);
diff --git a/src/migration/migratemanager.h b/src/migration/migratemanager.h
index 1efc5f7b8..8f59725a9 100644
--- a/src/migration/migratemanager.h
+++ b/src/migration/migratemanager.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXI_MIGRATION_MNGR_H
-#define KEXI_MIGRATION_MNGR_H
+#ifndef KEXI_MIGRATE_MANAGER_H
+#define KEXI_MIGRATE_MANAGER_H
#include <QObject>
#include <QMap>
diff --git a/src/mobile/KexiMobileWidget.h b/src/mobile/KexiMobileWidget.h
index 34af3b859..539f11192 100644
--- a/src/mobile/KexiMobileWidget.h
+++ b/src/mobile/KexiMobileWidget.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXIMOBILEWIDHET_H
-#define KEXIMOBILEWIDHET_H
+#ifndef KEXIMOBILEWIDGET_H
+#define KEXIMOBILEWIDGET_H
#include <QStackedWidget>
#include <core/kexiproject.h>
diff --git a/src/plugins/forms/widgets/kexidbutils.h \
b/src/plugins/forms/widgets/kexidbutils.h index 3b7deba5b..d03eccaa2 100644
--- a/src/plugins/forms/widgets/kexidbutils.h
+++ b/src/plugins/forms/widgets/kexidbutils.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KDBWIDGETS_UTILS_H
-#define KDBWIDGETS_UTILS_H
+#ifndef KEXI_DB_UTILS_H
+#define KEXI_DB_UTILS_H
#include <core/kexidataiteminterface.h>
diff --git a/src/plugins/forms/widgets/main/KexiStandardContainerFormWidgets.h \
b/src/plugins/forms/widgets/main/KexiStandardContainerFormWidgets.h index \
41271151e..6b731b15d 100644
--- a/src/plugins/forms/widgets/main/KexiStandardContainerFormWidgets.h
+++ b/src/plugins/forms/widgets/main/KexiStandardContainerFormWidgets.h
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXISTANDARDCONTAINERWIDGETS_H
-#define KEXISTANDARDCONTAINERWIDGETS_H
+#ifndef KEXISTANDARDCONTAINERFORMWIDGETS_H
+#define KEXISTANDARDCONTAINERFORMWIDGETS_H
#include "FormWidgetInterface.h"
#include "utils.h"
diff --git a/src/plugins/forms/widgets/webbrowser/WebBrowserWidget.cpp \
b/src/plugins/forms/widgets/webbrowser/WebBrowserWidget.cpp index \
6176e8e2f..6a108dde4 100644
--- a/src/plugins/forms/widgets/webbrowser/WebBrowserWidget.cpp
+++ b/src/plugins/forms/widgets/webbrowser/WebBrowserWidget.cpp
@@ -23,10 +23,7 @@
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <QWidget>
-#include <QPushButton>
-#include <KGuiItem>
-#include <KStandardGuiItem>
#include <KGuiItem>
#include <KStandardGuiItem>
#include <KLocalizedString>
diff --git a/src/plugins/importexport/csv/KexiCsvImportExportPlugin.h \
b/src/plugins/importexport/csv/KexiCsvImportExportPlugin.h index 8dae2fd13..e92ebee87 \
100644
--- a/src/plugins/importexport/csv/KexiCsvImportExportPlugin.h
+++ b/src/plugins/importexport/csv/KexiCsvImportExportPlugin.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXI_CSVIMPORTEXPORT_PART_H
-#define KEXI_CSVIMPORTEXPORT_PART_H
+#ifndef KEXI_CSVIMPORTEXPORT_PLUGIN_H
+#define KEXI_CSVIMPORTEXPORT_PLUGIN_H
#include <core/kexiinternalpart.h>
#include "kexicsvexportwizard.h"
diff --git a/src/plugins/importexport/csv/kexicsvimportoptionsdlg.h \
b/src/plugins/importexport/csv/kexicsvimportoptionsdlg.h index f0eaf2182..82f72aa9c \
100644
--- a/src/plugins/importexport/csv/kexicsvimportoptionsdlg.h
+++ b/src/plugins/importexport/csv/kexicsvimportoptionsdlg.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXICSVOPTIONSDIALOG_H
-#define KEXICSVOPTIONSDIALOG_H
+#ifndef KEXICSVIMPORTOPTIONSDLG_H
+#define KEXICSVIMPORTOPTIONSDLG_H
#include <QDialog>
#include <QCheckBox>
diff --git a/src/plugins/scripting/kexiscripting/KexiScriptingDebug.h \
b/src/plugins/scripting/kexiscripting/KexiScriptingDebug.h index defbd923e..f7ec7d3c7 \
100644
--- a/src/plugins/scripting/kexiscripting/KexiScriptingDebug.h
+++ b/src/plugins/scripting/kexiscripting/KexiScriptingDebug.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXISCRIPTDEBUG_H
-#define KEXISCRIPTDEBUG_H
+#ifndef KEXISCRIPTINGDEBUG_H
+#define KEXISCRIPTINGDEBUG_H
#include <QDebug>
diff --git a/src/plugins/tables/kexitabledesignerview.h \
b/src/plugins/tables/kexitabledesignerview.h index 68f522574..e0e5e92e8 100644
--- a/src/plugins/tables/kexitabledesignerview.h
+++ b/src/plugins/tables/kexitabledesignerview.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXITABLEDESIGNERINTERVIEW_H
-#define KEXITABLEDESIGNERINTERVIEW_H
+#ifndef KEXITABLEDESIGNERVIEW_H
+#define KEXITABLEDESIGNERVIEW_H
#include <KProperty>
diff --git a/src/plugins/tables/kexitabledesignerview_p.h \
b/src/plugins/tables/kexitabledesignerview_p.h index fa1811511..1261a5f3e 100644
--- a/src/plugins/tables/kexitabledesignerview_p.h
+++ b/src/plugins/tables/kexitabledesignerview_p.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXIALTERTABLEDIALOG_P_H
-#define KEXIALTERTABLEDIALOG_P_H
+#ifndef KEXITABLEDESIGNERVIEW_P_H
+#define KEXITABLEDESIGNERVIEW_P_H
#include "kexitabledesignerview.h"
#include <kundo2command.h>
diff --git a/src/plugins/tables/kexitablepart.cpp \
b/src/plugins/tables/kexitablepart.cpp index ef887c2b6..ce8cf8ba0 100644
--- a/src/plugins/tables/kexitablepart.cpp
+++ b/src/plugins/tables/kexitablepart.cpp
@@ -33,7 +33,6 @@
#include "kexitabledesigner_dataview.h"
#include "kexilookupcolumnpage.h"
#include <KexiWindow.h>
-#include <kexiutils/utils.h>
#include <KDbConnection>
diff --git a/src/widget/dataviewcommon/kexidataawareobjectiface.h \
b/src/widget/dataviewcommon/kexidataawareobjectiface.h index e51ecb38c..cdb356c99 \
100644
--- a/src/widget/dataviewcommon/kexidataawareobjectiface.h
+++ b/src/widget/dataviewcommon/kexidataawareobjectiface.h
@@ -23,8 +23,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXIDATAAWAREOBJECTINTERFACE_H
-#define KEXIDATAAWAREOBJECTINTERFACE_H
+#ifndef KEXIDATAAWAREOBJECTIFACE_H
+#define KEXIDATAAWAREOBJECTIFACE_H
#include "kexidataviewcommon_export.h"
#include <core/kexisearchandreplaceiface.h>
diff --git a/src/widget/dataviewcommon/kexidataprovider.h \
b/src/widget/dataviewcommon/kexidataprovider.h index ee65ec088..989e9f76c 100644
--- a/src/widget/dataviewcommon/kexidataprovider.h
+++ b/src/widget/dataviewcommon/kexidataprovider.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXIFORMDATAPROVIDER_H
-#define KEXIFORMDATAPROVIDER_H
+#ifndef KEXIDATAPROVIDER_H
+#define KEXIDATAPROVIDER_H
#include "kexidataviewcommon_export.h"
#include "kexiformdataiteminterface.h"
diff --git a/src/widget/properties/KexiCustomPropertyFactory.h \
b/src/widget/properties/KexiCustomPropertyFactory.h index 4f4ef4d1c..f94c51bc9 100644
--- a/src/widget/properties/KexiCustomPropertyFactory.h
+++ b/src/widget/properties/KexiCustomPropertyFactory.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXICUSTOMPROPFACTORY_H
-#define KEXICUSTOMPROPFACTORY_H
+#ifndef KEXICUSTOMPROPERTYFACTORY_H
+#define KEXICUSTOMPROPERTYFACTORY_H
#include "kexiextwidgets_export.h"
diff --git a/src/widget/properties/KexiCustomPropertyFactory_p.h \
b/src/widget/properties/KexiCustomPropertyFactory_p.h index 4a18f05f1..878a8222d \
100644
--- a/src/widget/properties/KexiCustomPropertyFactory_p.h
+++ b/src/widget/properties/KexiCustomPropertyFactory_p.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXICUSTOMPROPFACTORY_P_H
-#define KEXICUSTOMPROPFACTORY_P_H
+#ifndef KEXICUSTOMPROPERTYFACTORY_P_H
+#define KEXICUSTOMPROPERTYFACTORY_P_H
//! @todo #include <kexiblobbuffer.h>
#include <KPropertyStringEditor>
diff --git a/src/widget/relations/KexiRelationsView.h \
b/src/widget/relations/KexiRelationsView.h index e57e224c3..cbabceacc 100644
--- a/src/widget/relations/KexiRelationsView.h
+++ b/src/widget/relations/KexiRelationsView.h
@@ -42,7 +42,7 @@ public:
//! Sets database connection @a conn for which tables and connections will be \
displayed. //! If @a conn is 0, contents is cleared.
- //! @return true on successfull retrieval of table and relation information.
+ //! @return true on successful retrieval of table and relation information.
//! On failure result is available at conn->result() and KdbMessageGuard can be \
used. bool setConnection(KDbConnection *conn);
diff --git a/src/widget/tableview/KexiDataTableScrollArea.cpp \
b/src/widget/tableview/KexiDataTableScrollArea.cpp index c3017d726..f93a34e96 100644
--- a/src/widget/tableview/KexiDataTableScrollArea.cpp
+++ b/src/widget/tableview/KexiDataTableScrollArea.cpp
@@ -19,7 +19,6 @@
* Boston, MA 02110-1301, USA.
*/
-#include "KexiDataTableScrollArea.h"
#include "KexiDataTableScrollArea.h"
#include "KexiDataTableView.h"
diff --git a/src/widget/tableview/KexiTableScrollArea.cpp \
b/src/widget/tableview/KexiTableScrollArea.cpp index 453458580..8e543e58b 100644
--- a/src/widget/tableview/KexiTableScrollArea.cpp
+++ b/src/widget/tableview/KexiTableScrollArea.cpp
@@ -64,7 +64,6 @@
#include <QScrollArea>
#include <QApplication>
#include <QScrollBar>
-#include <QMenu>
#include <QAction>
#include <QDebug>
#ifdef KEXI_TABLE_PRINT_SUPPORT
diff --git a/src/widget/tableview/KexiTableScrollArea_p.h \
b/src/widget/tableview/KexiTableScrollArea_p.h index 709b9f2c9..e5f201a90 100644
--- a/src/widget/tableview/KexiTableScrollArea_p.h
+++ b/src/widget/tableview/KexiTableScrollArea_p.h
@@ -24,8 +24,8 @@
Original Project: buX (www.bux.at)
*/
-#ifndef KEXITABLEVIEW_P_H
-#define KEXITABLEVIEW_P_H
+#ifndef KEXITABLESCROLLAREA_P_H
+#define KEXITABLESCROLLAREA_P_H
#include "KexiTableScrollArea.h"
#include "KexiTableScrollAreaHeader.h"
diff --git a/src/widget/utils/kexidisplayutils.h \
b/src/widget/utils/kexidisplayutils.h index 0f6711b64..0bde15b8a 100644
--- a/src/widget/utils/kexidisplayutils.h
+++ b/src/widget/utils/kexidisplayutils.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXIDISPUTILS_H
-#define KEXIDISPUTILS_H
+#ifndef KEXIDISPLAYUTILS_H
+#define KEXIDISPLAYUTILS_H
#include "kexiguiutils_export.h"
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic