From kde-commits  Wed Aug 31 23:06:35 2011
From: Jaroslaw Staniek <staniek () kde ! org>
Date: Wed, 31 Aug 2011 23:06:35 +0000
To: kde-commits
Subject: [calligra] kexi/plugins/forms: fix includes, make signals nonvirtual
Message-Id: <20110831230635.389F0A60CD () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=131483203032095

Git commit bd6abdeafb5aeaed065392a18432e0730fd417f4 by Jaroslaw Staniek.
Committed on 01/09/2011 at 00:15.
Pushed by staniek into branch 'master'.

fix includes, make signals nonvirtual

M  +1    -1    kexi/plugins/forms/widgets/kexidbform.cpp
M  +3    -4    kexi/plugins/forms/kexiformscrollview.h

http://commits.kde.org/calligra/bd6abdeafb5aeaed065392a18432e0730fd417f4

diff --git a/kexi/plugins/forms/kexiformscrollview.h b/kexi/plugins/forms/kexiformscrollview.h
index 09516d6..43ce3f9 100644
--- a/kexi/plugins/forms/kexiformscrollview.h
+++ b/kexi/plugins/forms/kexiformscrollview.h
@@ -27,7 +27,6 @@
 #include <widget/kexiscrollview.h>
 #include <widget/utils/kexirecordnavigator.h>
 #include <widget/utils/kexisharedactionclient.h>
-#include <widget/tableview/kexidataawareobjectiface.h>
 #include <widget/dataviewcommon/kexidataawareobjectiface.h>
 
 //! @short KexiFormScrollView class provides a widget for displaying data in a form view
@@ -166,9 +165,9 @@ signals:
     void itemSelected(KexiDB::RecordData*);
     void cellSelected(int col, int row);
     void sortedColumnChanged(int col);
-    virtual void rowEditStarted(int row);
-    virtual void rowEditTerminated(int row);
-    virtual void updateSaveCancelActions();
+    void rowEditStarted(int row);
+    void rowEditTerminated(int row);
+    void updateSaveCancelActions();
     void reloadActions();
 
 protected slots:
diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp
index a28cf50..161d1ef 100644
--- a/kexi/plugins/forms/widgets/kexidbform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbform.cpp
@@ -41,7 +41,7 @@
 #include <formeditor/objecttree.h>
 //2.0 #include <formeditor/formmanager.h>
 #include <formeditor/widgetlibrary.h>
-#include <widget/tableview/kexidataawareobjectiface.h>
+#include <widget/dataviewcommon/kexidataawareobjectiface.h>
 #include <widget/kexiscrollview.h>
 #include <kexiutils/utils.h>
 #include <kexi_global.h>