← Back to branch summary

~ubuntu-branches/ubuntu/precise/koffice/precise

« back to all changes in this revision

Viewing changes to kexi/plugins/forms/kexiformmanager.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2010-10-27 17:52:57 UTC
  • mfrom: (0.12.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20101027175257-s04zqqk5bs8ckm9o
Tags: 1:2.2.83-0ubuntu1
* Merge with Debian git remaining changes:
 - Add build-deps on librcps-dev, opengtl-dev, libqtgtl-dev, freetds-dev,
   create-resources, libspnav-dev
 - Remove needless build-dep on libwv2-dev
 - koffice-libs recommends create-resources
 - krita recommends pstoedit
 - Keep our patches
* New upstream release 2.3 beta 3
  - Remove debian/patches fixed by upstream
  - Update install files

Show diffs side-by-side

added added

removed removed

Lines of Context:
kexi/plugins/forms/kexiformmanager.cpp
40
40
#include <formeditor/objecttree.h>
41
41
#include <formeditor/formIO.h>
42
42
#include <formeditor/kexiactionselectiondialog.h>
43
 
#include <formeditor/objecttreeview.h>
 
43
#include <formeditor/WidgetTreeWidget.h>
44
44
 
45
45
#include <koproperty/Set.h>
46
46
#include <koproperty/Property.h>
58
58
#ifdef KFD_SIGSLOTS
59
59
        dragConnectionAction = 0;
60
60
#endif
61
 
        treeView = 0;
 
61
        widgetTree = 0;
62
62
        collection = 0;
63
63
    }
64
64
    ~KexiFormManagerPrivate() {
69
69
    KexiFormPart* part;
70
70
    KFormDesigner::WidgetLibrary* lib;
71
71
    KFormDesigner::ActionGroup* widgetActionGroup;
72
 
    KFormDesigner::ObjectTreeView *treeView;
 
72
    KFormDesigner::WidgetTreeWidget *widgetTree;
73
73
#ifdef KEXI_DEBUG_GUI
74
74
    //! For debugging purposes
75
75
    QPointer<KPageDialog> uiCodeDialog;
106
106
{
107
107
}
108
108
 
109
 
void KexiFormManager::init(KexiFormPart *part, KFormDesigner::ObjectTreeView *treeView)
 
109
void KexiFormManager::init(KexiFormPart *part, KFormDesigner::WidgetTreeWidget *widgetTree)
110
110
{
111
111
/* @todo add configuration for supported factory groups */
112
112
    QStringList supportedFactoryGroups;
130
130
                this, SLOT(slotAssignAction()));
131
131
    }
132
132
 
133
 
    d->treeView = treeView;
134
 
    if (d->treeView) {
 
133
    d->widgetTree = widgetTree;
 
134
    if (d->widgetTree) {
135
135
#ifdef __GNUC__
136
136
#warning "Port this: connect()"
137
137
#else