Ignore:
Timestamp:
Aug 2, 2010, 9:27:30 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
54 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/tools/designer/src/components/formeditor/formwindow.cpp

    r651 r769  
    22202220        }
    22212221
     2222
     2223
     2224
     2225
     2226
    22222227        popup->addAction(manager->actionCut());
    22232228        popup->addAction(manager->actionCopy());

  • trunk/tools/designer/src/components/formeditor/formwindow.h

    r651 r769  
    279279    void checkPreviewGeometry(QRect &r);
    280280
    281     void finishContextMenu(QWidget *w, QWidget *menuParent, QContextMenuEvent *e);
    282 
    283281    bool handleContextMenu(QWidget *widget, QWidget *managedWidget, QContextMenuEvent *e);
    284282    bool handleMouseButtonDblClickEvent(QWidget *widget, QWidget *managedWidget, QMouseEvent *e);

  • trunk/tools/designer/src/components/formeditor/qdesigner_resource.cpp

    r651 r769  
    14471447
    14481448    QList<QWidget*> tabOrder;
    1449     foreach (QString widgetName, tabStops->elementTabStop()) {
     1449    foreach (widgetName, tabStops->elementTabStop()) {
    14501450        if (QWidget *w = qFindChild<QWidget*>(widget, widgetName)) {
    14511451            tabOrder.append(w);
    … …  
    24192419    if (resourceSet) {
    24202420        const QStringList activePaths = resourceSet->activeQrcPaths();
    2421         foreach (QString path, activePaths) {
     2421        foreach (path, activePaths) {
    24222422            if (qrcPaths.contains(path)) {
    24232423                DomResource *dom_res = new DomResource;

  • trunk/tools/designer/src/components/propertyeditor/designerpropertymanager.h

    r651 r769  
    103103    Q_OBJECT
    104104public:
    105     DesignerPropertyManager(QDesignerFormEditorInterface *core, QObject *parent = 0);
     105    DesignerPropertyManager(QDesignerFormEditorInterface *core, QObject *parent = 0);
    106106    ~DesignerPropertyManager();
    107107

  • trunk/tools/designer/src/designer/qdesigner_actions.cpp

    r651 r769  
    581581
    582582    bool atLeastOne = false;
    583     foreach (QString fileName, fileNames) {
     583    foreach (fileName, fileNames) {
    584584        if (readInForm(fileName) && !atLeastOne)
    585585            atLeastOne = true;
    … …  
    870870                removeBackup(backupFile);
    871871                fi.setFile(fileName);
    872                 backupFile = QString();
     872                backupFile();
    873873                if (fi.exists())
    874874                    backupFile = createBackup(fileName);

  • trunk/tools/designer/src/designer/qdesigner_server.cpp

    r651 r769  
    8484    if(sSocket->waitForConnected(3000))
    8585    {
    86         foreach(QString file, files)
     86        foreach(file, files)
    8787        {
    8888            QFileInfo fi(file);
    … …  
    9797void QDesignerServer::readFromClient()
    9898{
    99     QString file = QString();
    10099    while (m_socket->canReadLine()) {
    101         file = QString::fromUtf8(m_socket->readLine());
     100        file = QString::fromUtf8(m_socket->readLine());
    102101        if (!file.isNull()) {
    103102            file.remove(QLatin1Char('\n'));
    … …  
    144143void QDesignerClient::readFromSocket()
    145144{
    146     QString file = QString();
    147145    while (m_socket->canReadLine()) {
    148146        QString file = QString::fromUtf8(m_socket->readLine());

  • trunk/tools/designer/src/designer/qdesigner_server.h

    r651 r769  
    5454    Q_OBJECT
    5555public:
    56     QDesignerServer(QObject *parent = 0);
     56    QDesignerServer(QObject *parent = 0);
    5757    virtual ~QDesignerServer();
    5858
    … …  
    7575    Q_OBJECT
    7676public:
    77     QDesignerClient(quint16 port, QObject *parent = 0);
     77    QDesignerClient(quint16 port, QObject *parent = 0);
    7878    virtual ~QDesignerClient();
    7979

  • trunk/tools/designer/src/designer/versiondialog.cpp

    r651 r769  
    114114            m_path.lineTo(me->pos());
    115115            bool gotIt = true;
    116             QPoint pt;
    117             foreach(pt, hitPoints) {
     116            foreach(const QPoint &pt, hitPoints) {
    118117                if (!m_path.contains(pt)) {
    119118                    gotIt = false;
    … …  
    122121            }
    123122            if (gotIt) {
    124                 foreach(pt, missPoints) {
     123                foreach(pt, missPoints) {
    125124                    if (m_path.contains(pt)) {
    126125                        gotIt = false;

  • trunk/tools/designer/src/lib/shared/actioneditor.cpp

    r651 r769  
    429429}
    430430
    431 // Set an intial property and mark it as changed in the sheet
     431// Set an intial property and mark it as changed in the sheet
    432432static void setInitialProperty(QDesignerPropertySheetExtension *sheet, const QString &name, const QVariant &value)
    433433{

  • trunk/tools/designer/src/lib/shared/actionrepository.cpp

    r651 r769  
    7878}
    7979
    80 static QIcon fixActionIcon(const QIcon &icon)
    81 {
    82     if (icon.isNull())
    83         return qdesigner_internal::emptyIcon();
    84     return icon;
    85 }
    86 
    8780namespace qdesigner_internal {
    8881
    … …  
    9083ActionModel::ActionModel(QWidget *parent ) :
    9184    QStandardItemModel(parent),
     85
    9286    m_core(0)
    9387{
    … …  
    128122       list += item(row, i);
    129123
    130     setItems(m_core, actionOfItem(list.front()), list);
     124    setItems(m_core, actionOfItem(list.front()), list);
    131125}
    132126
    … …  
    151145        items.push_back(item);
    152146    }
    153     setItems(m_core, action, items);
     147    setItems(m_core, action, items);
    154148    appendRow(items);
    155149    return indexFromItem(items.front());
    … …  
    186180}
    187181
    188 void  ActionModel::setItems(QDesignerFormEditorInterface *core, QAction *action, QStandardItemList &sl)
     182void  ActionModel::setItems(QDesignerFormEditorInterface *core, QAction *action,
     183                            const QIcon &defaultIcon,
     184                            QStandardItemList &sl)
    189185{
    190186
    … …  
    201197    QStandardItem *item =  sl[NameColumn];
    202198    item->setText(action->objectName());
    203     item->setIcon(fixActionIcon(action->icon()));
     199    QIcon icon = action->icon();
     200    if (icon.isNull())
     201        icon = defaultIcon;
     202    item->setIcon(icon);
    204203    item->setToolTip(firstTooltip);
    205204    item->setWhatsThis(firstTooltip);
    … …  
    245244
    246245    QSet<QAction*> actions;
    247     foreach (const  QModelIndex &index, indexes)
     246    foreach (const QModelIndex &index, indexes)
    248247        if (QStandardItem *item = itemFromIndex(index))
    249248            if (QAction *action = actionOfItem(item))

  • trunk/tools/designer/src/lib/shared/actionrepository_p.h

    r651 r769  
    6060#include <QtGui/QListView>
    6161#include <QtGui/QStackedWidget>
     62
    6263
    6364QT_BEGIN_NAMESPACE
    … …  
    111112
    112113private:
     114
     115
    113116    void initializeHeaders();
    114 
    115     typedef QList<QStandardItem *> QStandardItemList;
    116     static void setItems(QDesignerFormEditorInterface *core, QAction *a, QStandardItemList &sl);
     117    static void setItems(QDesignerFormEditorInterface *core, QAction *a,
     118                         const QIcon &defaultIcon,
     119                         QStandardItemList &sl);
     120
     121    const QIcon m_emptyIcon;
    117122
    118123    QDesignerFormEditorInterface *m_core;

  • trunk/tools/designer/src/lib/shared/connectionedit_p.h

    r651 r769  
    8888    public:
    8989        enum Type { Source, Target };
    90         EndPoint(Connection *_con = 0, Type _type = Source) : con(_con), type(_type) {}
     90        EndPoint(Connection *_con = 0, Type _type = Source) : con(_con), type(_type) {}
    9191        bool isNull() const { return con == 0; }
    9292        bool operator == (const EndPoint &other) const { return con == other.con && type == other.type; }

  • trunk/tools/designer/src/lib/shared/filterwidget_p.h

    r651 r769  
    6767
    6868/* A line edit that displays a grayed hintText (like "Type Here to Filter")
    69  * when not focussed and empty. When connecting to the changed signals and
     69 * when not focused and empty. When connecting to the changed signals and
    7070 * querying text, one has to be aware that the text is set to that hint
    7171 * text if isShowingHintText() returns true (that is, does not contain

  • trunk/tools/designer/src/lib/shared/iconloader.cpp

    r651 r769  
    6161        << (QString::fromUtf8(":/trolltech/formeditor/images/designer_") + name);
    6262
    63     foreach (QString f, candidates) {
     63    foreach (f, candidates) {
    6464        if (QFile::exists(f))
    6565            return QIcon(f);
    … …  
    7171QDESIGNER_SHARED_EXPORT QIcon emptyIcon()
    7272{
    73     static const QIcon empty_icon(QLatin1String(":/trolltech/formeditor/images/emptyicon.png"));
    74     return  empty_icon;
     73    return QIcon(QLatin1String(":/trolltech/formeditor/images/emptyicon.png"));
    7574}
    7675

  • trunk/tools/designer/src/lib/shared/iconselector_p.h

    r651 r769  
    7777    Q_OBJECT
    7878
    79     LanguageResourceDialog(QDesignerResourceBrowserInterface *rb, QWidget *parent = 0);
     79    LanguageResourceDialog(QDesignerResourceBrowserInterface *rb, QWidget *parent = 0);
    8080
    8181public:

  • trunk/tools/designer/src/lib/shared/plugindialog.cpp

    r651 r769  
    106106        QFont boldFont = topLevelItem->font(0);
    107107
    108         foreach (QString fileName, fileNames) {
     108        foreach (fileName, fileNames) {
    109109            QPluginLoader loader(fileName);
    110110            const QFileInfo fileInfo(fileName);
    … …  
    128128        QTreeWidgetItem *topLevelItem = setTopLevelItem(QLatin1String("Failed Plugins"));
    129129        const QFont boldFont = topLevelItem->font(0);
    130         foreach (const QString plugin, notLoadedPlugins) {
     130        foreach (const QString plugin, notLoadedPlugins) {
    131131            const QString failureReason = pluginManager->failureReason(plugin);
    132132            QTreeWidgetItem *pluginItem = setPluginItem(topLevelItem, plugin, boldFont);

  • trunk/tools/designer/src/lib/shared/qdesigner_introspection.cpp

    r651 r769  
    6464{
    6565    if (!c)
    66         return QString::null;
     66        return QString;
    6767    return QString::fromUtf8(c);
    6868}

  • trunk/tools/designer/src/lib/shared/qdesigner_menu.cpp

    r651 r769  
    8989QDesignerMenu::QDesignerMenu(QWidget *parent) :
    9090    QMenu(parent),
     91
    9192    m_currentIndex(0),
    9293    m_addItem(new SpecialMenuAction(this)),
    … …  
    557558QRect QDesignerMenu::subMenuPixmapRect(QAction *action) const
    558559{
    559     static const QPixmap pm(QLatin1String(":/trolltech/formeditor/images/submenu.png"));
    560560    const QRect g = actionGeometry(action);
    561     const int x = layoutDirection() == Qt::LeftToRight ? (g.right() - pm.width() - 2) : 2;
    562     const int y = g.top() + (g.height() - pm.height())/2 + 1;
    563     return QRect(x, y, pm.width(), pm.height());
     561    const int x = layoutDirection() == Qt::LeftToRight ? (g.right() - .width() - 2) : 2;
     562    const int y = g.top() + (g.height() - .height())/2 + 1;
     563    return QRect(x, y, .height());
    564564}
    565565
    … …  
    598598            p.fillRect(g, lg);
    599599        } else if (hasSubMenuPixmap(a)) {
    600             static const QPixmap pm(QLatin1String(":/trolltech/formeditor/images/submenu.png"));
    601             p.drawPixmap(subMenuPixmapRect(a).topLeft(), pm);
     600            p.drawPixmap(subMenuPixmapRect(a).topLeft(), m_subMenuPixmap);
    602601        }
    603602    }

  • trunk/tools/designer/src/lib/shared/qdesigner_menu_p.h

    r651 r769  
    5858#include <QtGui/QAction>
    5959#include <QtGui/QMenu>
     60
    6061#include <QtCore/QHash>
    6162
    … …  
    184185    bool hideSubMenuOnCursorKey();
    185186    bool showSubMenuOnCursorKey();
     187
    186188
    187189    QPoint m_startPosition;

  • trunk/tools/designer/src/lib/shared/qdesigner_objectinspector_p.h

    r651 r769  
    8686    Q_OBJECT
    8787public:
    88     QDesignerObjectInspector(QWidget *parent = 0, Qt::WindowFlags flags = 0);
     88    QDesignerObjectInspector(QWidget *parent = 0, Qt::WindowFlags flags = 0);
    8989
    9090    // Select a qobject unmanaged by form window

  • trunk/tools/designer/src/lib/shared/qdesigner_promotiondialog_p.h

    r651 r769  
    8181        Q_OBJECT
    8282    public:
    83         NewPromotedClassPanel(const QStringList &baseClasses,
    84                               int selectedBaseClass = -1,
    85                                QWidget *parent = 0);
     83        NewPromotedClassPanel(const QStringList &baseClasses,
     84                              int selectedBaseClass = -1,
     85                               QWidget *parent = 0);
    8686
    8787        signals:
    … …  
    115115        enum Mode { ModeEdit, ModeEditChooseClass };
    116116
    117         QDesignerPromotionDialog(QDesignerFormEditorInterface *core,
    118                                  QWidget *parent = 0,
    119                                  const QString &promotableWidgetClassName = QString(),
    120                                  QString *promoteTo = 0);
     117        QDesignerPromotionDialog(QDesignerFormEditorInterface *core,
     118                                 QWidget *parent = 0,
     119                                 const QString &promotableWidgetClassName = QString(),
     120                                 QString *promoteTo = 0);
    121121        // Return an alphabetically ordered list of base class names for adding new classes.
    122122        static const QStringList &baseClassNames(const QDesignerPromotionInterface *promotion);

  • trunk/tools/designer/src/lib/shared/qdesigner_propertyeditor_p.h

    r651 r769  
    7070    Q_OBJECT
    7171public:
    72     QDesignerPropertyEditor(QWidget *parent = 0, Qt::WindowFlags flags = 0);
     72    QDesignerPropertyEditor(QWidget *parent = 0, Qt::WindowFlags flags = 0);
    7373
    7474    // A pair <ValidationMode, bool isTranslatable>.

  • trunk/tools/designer/src/lib/shared/qdesigner_taskmenu.cpp

    r651 r769  
    676676        const QStringList parameterNames = qVariantValue<QStringList>(selectedItem->data(0, Qt::UserRole));
    677677
    678         // TODO: Check wether signal is connected to slot
     678        // TODO: Check wether signal is connected to slot
    679679        integr->emitNavigateToSlot(objectName, signalSignature, parameterNames);
    680680    }

  • trunk/tools/designer/src/lib/shared/qdesigner_toolbar.cpp

    r651 r769  
    449449}
    450450
    451 //that's a trick to get acces to the initStyleOption which is a protected member
     451//that's a trick to get acces to the initStyleOption which is a protected member
    452452class FriendlyToolBar : public QToolBar {
    453453public:

  • trunk/tools/designer/src/lib/shared/qdesigner_utils_p.h

    r651 r769  
    299299    Q_OBJECT
    300300public:
    301     DesignerIconCache(DesignerPixmapCache *pixmapCache, QObject *parent = 0);
     301    DesignerIconCache(DesignerPixmapCache *pixmapCache, QObject *parent = 0);
    302302    QIcon icon(const PropertySheetIconValue &value) const;
    303303    void clear();
    … …  
    314314{
    315315public:
    316     PropertySheetStringValue(const QString &value = QString(),
     316    PropertySheetStringValue(const QString &value = QString(),
    317317                             bool translatable = true,
    318318                             const QString &disambiguation = QString(),
    … …  
    346346{
    347347public:
    348     PropertySheetKeySequenceValue(const QKeySequence &value = QKeySequence(),
     348    PropertySheetKeySequenceValue(const QKeySequence &value = QKeySequence(),
    349349                                  bool translatable = true,
    350350                                  const QString &disambiguation = QString(),
    351351                                  const QString &comment = QString());
    352     PropertySheetKeySequenceValue(const QKeySequence::StandardKey &standardKey,
     352    PropertySheetKeySequenceValue(const QKeySequence::StandardKey &standardKey,
    353353                                  bool translatable = true,
    354354                                  const QString &disambiguation = QString(),

  • trunk/tools/designer/src/lib/shared/qdesigner_widgetbox_p.h

    r651 r769  
    7171    enum LoadMode { LoadMerge, LoadReplace, LoadCustomWidgetsOnly };
    7272
    73     QDesignerWidgetBox(QWidget *parent = 0, Qt::WindowFlags flags = 0);
     73    QDesignerWidgetBox(QWidget *parent = 0, Qt::WindowFlags flags = 0);
    7474
    7575    LoadMode loadMode() const;

  • trunk/tools/designer/src/lib/shared/qtresourceview_p.h

    r651 r769  
    6969    Q_OBJECT
    7070public:
    71     QtResourceView(QDesignerFormEditorInterface *core, QWidget *parent = 0);
     71    QtResourceView(QDesignerFormEditorInterface *core, QWidget *parent = 0);
    7272    ~QtResourceView();
    7373
    … …  
    121121    Q_OBJECT
    122122public:
    123     QtResourceViewDialog(QDesignerFormEditorInterface *core, QWidget *parent = 0);
     123    QtResourceViewDialog(QDesignerFormEditorInterface *core, QWidget *parent = 0);
    124124    virtual ~QtResourceViewDialog();
    125125

  • trunk/tools/designer/src/lib/shared/richtexteditor_p.h

    r651 r769  
    7373    Q_OBJECT
    7474public:
    75     RichTextEditorDialog(QDesignerFormEditorInterface *core, QWidget *parent = 0);
     75    RichTextEditorDialog(QDesignerFormEditorInterface *core, QWidget *parent = 0);
    7676    ~RichTextEditorDialog();
    7777

  • trunk/tools/designer/src/lib/shared/shared_settings.cpp

    r651 r769  
    162162    // get template paths excluding internal ones
    163163    QStringList rc = formTemplatePaths();
    164     foreach (QString internalTemplatePath, defaultFormTemplatePaths()) {
     164    foreach (internalTemplatePath, defaultFormTemplatePaths()) {
    165165        const int index = rc.indexOf(internalTemplatePath);
    166166        if (index != -1)

  • trunk/tools/designer/src/lib/shared/textpropertyeditor_p.h

    r651 r769  
    9191        };
    9292
    93         TextPropertyEditor(QWidget *parent = 0, EmbeddingMode embeddingMode = EmbeddingNone, TextPropertyValidationMode validationMode = ValidationMultiLine);
     93        TextPropertyEditor(QWidget *parent = 0, EmbeddingMode embeddingMode = EmbeddingNone, TextPropertyValidationMode validationMode = ValidationMultiLine);
    9494
    9595        TextPropertyValidationMode textPropertyValidationMode() const { return m_validationMode; }

  • trunk/tools/designer/src/lib/shared/widgetdatabase_p.h

    r651 r769  
    7575{
    7676public:
    77     WidgetDataBaseItem(const QString &name = QString(),
    78                        const QString &group = QString());
     77    WidgetDataBaseItem(const QString &name = QString(),
     78                       const QString &group = QString());
    7979
    8080    QString name() const;
    … …  
    160160    Q_OBJECT
    161161public:
    162     WidgetDataBase(QDesignerFormEditorInterface *core, QObject *parent = 0);
     162    WidgetDataBase(QDesignerFormEditorInterface *core, QObject *parent = 0);
    163163    virtual ~WidgetDataBase();
    164164

  • trunk/tools/designer/src/lib/uilib/abstractformbuilder.cpp

    r651 r769  
    365365    if (!zOrderNames.isEmpty()) {
    366366        QList<QWidget *> zOrder = qVariantValue<QWidgetList>(w->property("_q_zOrder"));
    367         foreach (QString widgetName, zOrderNames) {
     367        foreach (widgetName, zOrderNames) {
    368368            if (QWidget *child = qFindChild<QWidget*>(w, widgetName)) {
    369369                if (child->parentWidget() == w) {

  • trunk/tools/designer/src/lib/uilib/formbuilder.cpp

    r651 r769  
    495495    m_customWidgets.clear();
    496496
    497     foreach (QString path, m_pluginPaths) {
     497    foreach (path, m_pluginPaths) {
    498498        const QDir dir(path);
    499499        const QStringList candidates = dir.entryList(QDir::Files);

  • trunk/tools/designer/src/plugins/activeqt/qaxwidgetextrainfo.h

    r651 r769  
    7878    Q_OBJECT
    7979public:
    80     QAxWidgetExtraInfoFactory(QDesignerFormEditorInterface *core, QExtensionManager *parent = 0);
     80    QAxWidgetExtraInfoFactory(QDesignerFormEditorInterface *core, QExtensionManager *parent = 0);
    8181
    8282protected:

  • trunk/tools/designer/src/plugins/activeqt/qdesigneraxwidget.h

    r651 r769  
    106106class QDesignerAxPluginWidget : public QDesignerAxWidget
    107107{
    108    // No Q_OBJECT here! - meta functionality is overriden
     108   // No Q_OBJECT here! - meta functionality is overriden
    109109public:
    110110    explicit QDesignerAxPluginWidget(QWidget *parent);

  • trunk/tools/designer/src/plugins/widgets/q3iconview/q3iconview_extrainfo.h

    r651 r769  
    8282    Q_OBJECT
    8383public:
    84     Q3IconViewExtraInfoFactory(QDesignerFormEditorInterface *core, QExtensionManager *parent = 0);
     84    Q3IconViewExtraInfoFactory(QDesignerFormEditorInterface *core, QExtensionManager *parent = 0);
    8585
    8686protected:

  • trunk/tools/designer/src/plugins/widgets/q3iconview/q3iconview_plugin.h

    r651 r769  
    5252    Q_INTERFACES(QDesignerCustomWidgetInterface)
    5353public:
    54     Q3IconViewPlugin(const QIcon &icon, QObject *parent = 0);
     54    Q3IconViewPlugin(const QIcon &icon, QObject *parent = 0);
    5555
    5656    virtual QString name() const;

  • trunk/tools/designer/src/plugins/widgets/q3listbox/q3listbox_extrainfo.h

    r651 r769  
    8080    Q_OBJECT
    8181public:
    82     Q3ListBoxExtraInfoFactory(QDesignerFormEditorInterface *core, QExtensionManager *parent = 0);
     82    Q3ListBoxExtraInfoFactory(QDesignerFormEditorInterface *core, QExtensionManager *parent = 0);
    8383
    8484protected:

  • trunk/tools/designer/src/plugins/widgets/q3listbox/q3listbox_plugin.h

    r651 r769  
    5252    Q_INTERFACES(QDesignerCustomWidgetInterface)
    5353public:
    54     Q3ListBoxPlugin(const QIcon &icon, QObject *parent = 0);
     54    Q3ListBoxPlugin(const QIcon &icon, QObject *parent = 0);
    5555
    5656    virtual QString name() const;

  • trunk/tools/designer/src/plugins/widgets/q3listview/q3listview_extrainfo.h

    r651 r769  
    8383    Q_OBJECT
    8484public:
    85     Q3ListViewExtraInfoFactory(QDesignerFormEditorInterface *core, QExtensionManager *parent = 0);
     85    Q3ListViewExtraInfoFactory(QDesignerFormEditorInterface *core, QExtensionManager *parent = 0);
    8686
    8787protected:

  • trunk/tools/designer/src/plugins/widgets/q3listview/q3listview_plugin.h

    r651 r769  
    5252    Q_INTERFACES(QDesignerCustomWidgetInterface)
    5353public:
    54     Q3ListViewPlugin(const QIcon &icon, QObject *parent = 0);
     54    Q3ListViewPlugin(const QIcon &icon, QObject *parent = 0);
    5555
    5656    virtual QString name() const;

  • trunk/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.h

    r651 r769  
    5252    Q_INTERFACES(QDesignerCustomWidgetInterface)
    5353public:
    54     Q3MainWindowPlugin(const QIcon &icon, QObject *parent = 0);
     54    Q3MainWindowPlugin(const QIcon &icon, QObject *parent = 0);
    5555
    5656    virtual QString name() const;

  • trunk/tools/designer/src/plugins/widgets/q3table/q3table_extrainfo.h

    r651 r769  
    8080    Q_OBJECT
    8181public:
    82     Q3TableExtraInfoFactory(QDesignerFormEditorInterface *core, QExtensionManager *parent = 0);
     82    Q3TableExtraInfoFactory(QDesignerFormEditorInterface *core, QExtensionManager *parent = 0);
    8383
    8484protected:

  • trunk/tools/designer/src/plugins/widgets/q3table/q3table_plugin.h

    r651 r769  
    5252    Q_INTERFACES(QDesignerCustomWidgetInterface)
    5353public:
    54     Q3TablePlugin(const QIcon &icon, QObject *parent = 0);
     54    Q3TablePlugin(const QIcon &icon, QObject *parent = 0);
    5555
    5656    virtual QString name() const;

  • trunk/tools/designer/src/plugins/widgets/q3textedit/q3textedit_extrainfo.h

    r651 r769  
    8080    Q_OBJECT
    8181public:
    82     Q3TextEditExtraInfoFactory(QDesignerFormEditorInterface *core, QExtensionManager *parent = 0);
     82    Q3TextEditExtraInfoFactory(QDesignerFormEditorInterface *core, QExtensionManager *parent = 0);
    8383
    8484protected:

  • trunk/tools/designer/src/plugins/widgets/q3textedit/q3textedit_plugin.h

    r651 r769  
    5252    Q_INTERFACES(QDesignerCustomWidgetInterface)
    5353public:
    54     Q3TextEditPlugin(const QIcon &icon, QObject *parent = 0);
     54    Q3TextEditPlugin(const QIcon &icon, QObject *parent = 0);
    5555
    5656    virtual QString name() const;

  • trunk/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.h

    r651 r769  
    7979    Q_OBJECT
    8080public:
    81     Q3ToolBarExtraInfoFactory(QDesignerFormEditorInterface *core, QExtensionManager *parent = 0);
     81    Q3ToolBarExtraInfoFactory(QDesignerFormEditorInterface *core, QExtensionManager *parent = 0);
    8282
    8383protected:

  • trunk/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_plugin.h

    r651 r769  
    5252    Q_INTERFACES(QDesignerCustomWidgetInterface)
    5353public:
    54     Q3ToolBarPlugin(const QIcon &icon, QObject *parent = 0);
     54    Q3ToolBarPlugin(const QIcon &icon, QObject *parent = 0);
    5555
    5656    virtual QString name() const;

  • trunk/tools/designer/src/plugins/widgets/q3widgets/q3widget_plugins.h

    r651 r769  
    5252    Q_INTERFACES(QDesignerCustomWidgetInterface)
    5353public:
    54     Q3ButtonGroupPlugin(const QIcon &icon, QObject *parent = 0);
     54    Q3ButtonGroupPlugin(const QIcon &icon, QObject *parent = 0);
    5555    virtual ~Q3ButtonGroupPlugin();
    5656
    … …  
    8181    Q_INTERFACES(QDesignerCustomWidgetInterface)
    8282public:
    83     Q3ComboBoxPlugin(const QIcon &icon, QObject *parent = 0);
     83    Q3ComboBoxPlugin(const QIcon &icon, QObject *parent = 0);
    8484    virtual ~Q3ComboBoxPlugin();
    8585
    … …  
    110110    Q_INTERFACES(QDesignerCustomWidgetInterface)
    111111public:
    112     Q3DateEditPlugin(const QIcon &icon, QObject *parent = 0);
     112    Q3DateEditPlugin(const QIcon &icon, QObject *parent = 0);
    113113
    114114    virtual QString name() const;
    … …  
    134134    Q_INTERFACES(QDesignerCustomWidgetInterface)
    135135public:
    136     Q3DateTimeEditPlugin(const QIcon &icon, QObject *parent = 0);
     136    Q3DateTimeEditPlugin(const QIcon &icon, QObject *parent = 0);
    137137
    138138    virtual QString name() const;
    … …  
    158158    Q_INTERFACES(QDesignerCustomWidgetInterface)
    159159public:
    160     Q3FramePlugin(const QIcon &icon, QObject *parent = 0);
     160    Q3FramePlugin(const QIcon &icon, QObject *parent = 0);
    161161    virtual ~Q3FramePlugin();
    162162
    … …  
    187187    Q_INTERFACES(QDesignerCustomWidgetInterface)
    188188public:
    189     Q3GroupBoxPlugin(const QIcon &icon, QObject *parent = 0);
     189    Q3GroupBoxPlugin(const QIcon &icon, QObject *parent = 0);
    190190    virtual ~Q3GroupBoxPlugin();
    191191
    … …  
    216216    Q_INTERFACES(QDesignerCustomWidgetInterface)
    217217public:
    218     Q3ProgressBarPlugin(const QIcon &icon, QObject *parent = 0);
     218    Q3ProgressBarPlugin(const QIcon &icon, QObject *parent = 0);
    219219
    220220    virtual QString name() const;
    … …  
    240240    Q_INTERFACES(QDesignerCustomWidgetInterface)
    241241public:
    242     Q3TextBrowserPlugin(const QIcon &icon, QObject *parent = 0);
     242    Q3TextBrowserPlugin(const QIcon &icon, QObject *parent = 0);
    243243
    244244    virtual QString name() const;
    … …  
    264264    Q_INTERFACES(QDesignerCustomWidgetInterface)
    265265public:
    266     Q3TimeEditPlugin(const QIcon &icon, QObject *parent = 0);
     266    Q3TimeEditPlugin(const QIcon &icon, QObject *parent = 0);
    267267
    268268    virtual QString name() const;

  • trunk/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.h

    r651 r769  
    5252    Q_INTERFACES(QDesignerCustomWidgetInterface)
    5353public:
    54     Q3WidgetStackPlugin(const QIcon &icon, QObject *parent = 0);
     54    Q3WidgetStackPlugin(const QIcon &icon, QObject *parent = 0);
    5555
    5656    virtual QString name() const;

  • trunk/tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.h

    r651 r769  
    6060    Q_OBJECT
    6161public:
    62     Q3WizardHelper(Q3Wizard *wizard);
     62    Q3WizardHelper(Q3Wizard *wizard);
    6363private slots:
    6464    void slotCurrentChanged();
    … …  
    7272    Q_INTERFACES(QDesignerExtraInfoExtension)
    7373public:
    74     Q3WizardExtraInfo(Q3Wizard *wizard, QDesignerFormEditorInterface *core, QObject *parent);
     74    Q3WizardExtraInfo(Q3Wizard *wizard, QDesignerFormEditorInterface *core, QObject *parent);
    7575
    7676    virtual QWidget *widget() const;

  • trunk/tools/designer/src/plugins/widgets/q3wizard/q3wizard_plugin.h

    r651 r769  
    5252    Q_INTERFACES(QDesignerCustomWidgetInterface)
    5353public:
    54     Q3WizardPlugin(const QIcon &icon, QObject *parent = 0);
     54    Q3WizardPlugin(const QIcon &icon, QObject *parent = 0);
    5555
    5656    virtual QString name() const;

  • trunk/tools/designer/src/src.pro

    r561 r769  
    1010CONFIG(shared,shared|static):SUBDIRS += plugins
    1111
    12 wince*: SUBDIRS -= designer plugins
    13 symbian: SUBDIRS = uitools
    14 contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= lib components
     12symbian|wince*: SUBDIRS = uitools
Note: See TracChangeset for help on using the changeset viewer.