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:
18 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • 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;
Note: See TracChangeset for help on using the changeset viewer.