From b29f51357b4d18f33f5d522994aeff149737b358 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 15 Jan 2014 22:17:52 +0100 Subject: whitespace fixes expand tabs, fix indentation, remove trailing whitespace. Change-Id: Ibec1bbad9e8faff81671ce9d1c7bb4fb9b340bb9 Reviewed-by: Joerg Bornemann --- examples/activeqt/hierarchy/hierarchy.pro | 6 +- examples/activeqt/hierarchy/objects.cpp | 2 +- examples/activeqt/hierarchy/objects.h | 2 +- examples/activeqt/menus/main.cpp | 14 ++-- examples/activeqt/menus/menus.cpp | 6 +- examples/activeqt/menus/menus.pro | 6 +- examples/activeqt/multiple/ax1.h | 14 ++-- examples/activeqt/multiple/ax2.h | 22 +++--- examples/activeqt/multiple/multiple.pro | 6 +- examples/activeqt/opengl/glbox.cpp | 44 +++++------ examples/activeqt/opengl/glbox.h | 16 ++-- examples/activeqt/opengl/main.cpp | 24 +++--- examples/activeqt/opengl/opengl.pro | 12 +-- examples/activeqt/qutlook/addressview.cpp | 8 +- examples/activeqt/qutlook/qutlook.pro | 2 +- examples/activeqt/simple/main.cpp | 70 ++++++++--------- examples/activeqt/simple/simple.pro | 4 +- examples/activeqt/webbrowser/main.cpp | 20 ++--- examples/activeqt/webbrowser/webaxwidget.h | 4 +- examples/activeqt/webbrowser/webbrowser.pro | 4 +- examples/activeqt/wrapper/main.cpp | 112 ++++++++++++++-------------- examples/activeqt/wrapper/wrapper.pro | 6 +- 22 files changed, 202 insertions(+), 202 deletions(-) (limited to 'examples') diff --git a/examples/activeqt/hierarchy/hierarchy.pro b/examples/activeqt/hierarchy/hierarchy.pro index ba8765a..c0d534f 100644 --- a/examples/activeqt/hierarchy/hierarchy.pro +++ b/examples/activeqt/hierarchy/hierarchy.pro @@ -1,11 +1,11 @@ TEMPLATE = lib -TARGET = hierarchyax +TARGET = hierarchyax CONFIG += warn_off dll QT += widgets axserver -SOURCES = objects.cpp main.cpp -HEADERS = objects.h +SOURCES = objects.cpp main.cpp +HEADERS = objects.h RC_FILE = hierarchy.rc DEF_FILE = hierarchy.def diff --git a/examples/activeqt/hierarchy/objects.cpp b/examples/activeqt/hierarchy/objects.cpp index f9af4b0..84237b2 100644 --- a/examples/activeqt/hierarchy/objects.cpp +++ b/examples/activeqt/hierarchy/objects.cpp @@ -47,7 +47,7 @@ QParentWidget::QParentWidget(QWidget *parent) : QWidget(parent) { - vbox = new QVBoxLayout(this); + vbox = new QVBoxLayout(this); } //! [0] //! [1] diff --git a/examples/activeqt/hierarchy/objects.h b/examples/activeqt/hierarchy/objects.h index 5cd47ce..1112984 100644 --- a/examples/activeqt/hierarchy/objects.h +++ b/examples/activeqt/hierarchy/objects.h @@ -79,7 +79,7 @@ class QSubWidget : public QWidget Q_CLASSINFO("ClassID", "{850652f4-8f71-4f69-b745-bce241ccdc30}"); Q_CLASSINFO("InterfaceID", "{2d76cc2f-3488-417a-83d6-debff88b3c3f}"); Q_CLASSINFO("ToSuperClass", "QSubWidget"); - + public: QSubWidget(QWidget *parent = 0, const QString &name = QString()); diff --git a/examples/activeqt/menus/main.cpp b/examples/activeqt/menus/main.cpp index 332f06d..6255e57 100644 --- a/examples/activeqt/menus/main.cpp +++ b/examples/activeqt/menus/main.cpp @@ -43,11 +43,11 @@ #include QAXFACTORY_DEFAULT(QMenus, - "{4dc3f340-a6f7-44e4-a79b-3e9217695fbd}", - "{9ee49617-7d5c-441a-b833-4b068d40d751}", - "{13eca64b-ee2a-4f3c-aa04-5d9d975979a7}", - "{ce947ee3-0403-4fdc-895a-4fe779394b46}", - "{8de435ce-8d2a-46ac-b3b3-cb800d0847c7}"); + "{4dc3f340-a6f7-44e4-a79b-3e9217695fbd}", + "{9ee49617-7d5c-441a-b833-4b068d40d751}", + "{13eca64b-ee2a-4f3c-aa04-5d9d975979a7}", + "{ce947ee3-0403-4fdc-895a-4fe779394b46}", + "{8de435ce-8d2a-46ac-b3b3-cb800d0847c7}"); int main( int argc, char **argv ) { @@ -55,8 +55,8 @@ int main( int argc, char **argv ) QWidget *window = 0; if ( !QAxFactory::isServer() ) { - window = new QMenus(); - window->show(); + window = new QMenus(); + window->show(); } return a.exec(); diff --git a/examples/activeqt/menus/menus.cpp b/examples/activeqt/menus/menus.cpp index 1311963..908c88c 100644 --- a/examples/activeqt/menus/menus.cpp +++ b/examples/activeqt/menus/menus.cpp @@ -49,7 +49,7 @@ #include "fileopen.xpm" #include "filesave.xpm" -QMenus::QMenus(QWidget *parent) +QMenus::QMenus(QWidget *parent) : QMainWindow(parent, 0) // QMainWindow's default flag is WType_TopLevel { QAction *action; @@ -167,8 +167,8 @@ void QMenus::editAdvancedStyle() void QMenus::helpAbout() { - QMessageBox::about(this, "About QMenus", - "This example implements an in-place ActiveX control with menus and status messages."); + QMessageBox::about(this, "About QMenus", + "This example implements an in-place ActiveX control with menus and status messages."); } void QMenus::helpAboutQt() diff --git a/examples/activeqt/menus/menus.pro b/examples/activeqt/menus/menus.pro index 9be1688..be5d75d 100644 --- a/examples/activeqt/menus/menus.pro +++ b/examples/activeqt/menus/menus.pro @@ -1,11 +1,11 @@ TEMPLATE = app -TARGET = menusax +TARGET = menusax CONFIG += warn_off QT += widgets axserver -SOURCES = main.cpp menus.cpp -HEADERS = menus.h +SOURCES = main.cpp menus.cpp +HEADERS = menus.h RC_FILE = menus.rc # install diff --git a/examples/activeqt/multiple/ax1.h b/examples/activeqt/multiple/ax1.h index 7f502ab..72bbe5d 100644 --- a/examples/activeqt/multiple/ax1.h +++ b/examples/activeqt/multiple/ax1.h @@ -61,21 +61,21 @@ public: QColor fillColor() const { - return fill_color; + return fill_color; } void setFillColor(const QColor &fc) { - fill_color = fc; - repaint(); + fill_color = fc; + repaint(); } protected: void paintEvent(QPaintEvent *e) { - QPainter paint(this); - QRect r = rect(); - r.adjust(10, 10, -10, -10); - paint.fillRect(r, fill_color); + QPainter paint(this); + QRect r = rect(); + r.adjust(10, 10, -10, -10); + paint.fillRect(r, fill_color); } private: diff --git a/examples/activeqt/multiple/ax2.h b/examples/activeqt/multiple/ax2.h index 5efeee9..239e93e 100644 --- a/examples/activeqt/multiple/ax2.h +++ b/examples/activeqt/multiple/ax2.h @@ -58,31 +58,31 @@ class QAxWidget2 : public QWidget Q_PROPERTY( int lineWidth READ lineWidth WRITE setLineWidth ) public: QAxWidget2(QWidget *parent = 0) - : QWidget(parent), line_width( 1 ) + : QWidget(parent), line_width( 1 ) { } int lineWidth() const { - return line_width; + return line_width; } void setLineWidth( int lw ) { - line_width = lw; - repaint(); + line_width = lw; + repaint(); } protected: void paintEvent( QPaintEvent *e ) { - QPainter paint( this ); - QPen pen = paint.pen(); - pen.setWidth( line_width ); - paint.setPen( pen ); + QPainter paint( this ); + QPen pen = paint.pen(); + pen.setWidth( line_width ); + paint.setPen( pen ); - QRect r = rect(); - r.adjust( 10, 10, -10, -10 ); - paint.drawEllipse( r ); + QRect r = rect(); + r.adjust( 10, 10, -10, -10 ); + paint.drawEllipse( r ); } private: diff --git a/examples/activeqt/multiple/multiple.pro b/examples/activeqt/multiple/multiple.pro index 56e413d..3254c0e 100644 --- a/examples/activeqt/multiple/multiple.pro +++ b/examples/activeqt/multiple/multiple.pro @@ -1,11 +1,11 @@ TEMPLATE = lib -TARGET = multipleax +TARGET = multipleax CONFIG += warn_off dll QT += widgets axserver -SOURCES = main.cpp -HEADERS = ax1.h ax2.h +SOURCES = main.cpp +HEADERS = ax1.h ax2.h RC_FILE = multipleax.rc DEF_FILE = multipleax.def diff --git a/examples/activeqt/opengl/glbox.cpp b/examples/activeqt/opengl/glbox.cpp index 01ac4f3..69285fa 100644 --- a/examples/activeqt/opengl/glbox.cpp +++ b/examples/activeqt/opengl/glbox.cpp @@ -65,8 +65,8 @@ GLBox::GLBox( QWidget* parent, const char* name ) : QGLWidget( parent ) { - xRot = yRot = zRot = 0.0; // default object rotation - scale = 1.25; // default object scale + xRot = yRot = zRot = 0.0; // default object rotation + scale = 1.25; // default object scale object = 0; } @@ -95,8 +95,8 @@ void GLBox::paintGL() glTranslatef( 0.0, 0.0, -10.0 ); glScalef( scale, scale, scale ); - glRotatef( xRot, 1.0, 0.0, 0.0 ); - glRotatef( yRot, 0.0, 1.0, 0.0 ); + glRotatef( xRot, 1.0, 0.0, 0.0 ); + glRotatef( yRot, 0.0, 1.0, 0.0 ); glRotatef( zRot, 0.0, 0.0, 1.0 ); glCallList( object ); @@ -109,8 +109,8 @@ void GLBox::paintGL() void GLBox::initializeGL() { - qglClearColor(Qt::black); // Let OpenGL clear to black - object = makeObject(); // Generate an OpenGL display list + qglClearColor(Qt::black); // Let OpenGL clear to black + object = makeObject(); // Generate an OpenGL display list glShadeModel( GL_FLAT ); } @@ -135,14 +135,14 @@ void GLBox::resizeGL( int w, int h ) */ GLuint GLBox::makeObject() -{ +{ GLuint list; list = glGenLists( 1 ); glNewList( list, GL_COMPILE ); - qglColor(Qt::white); // Shorthand for glColor3f or glIndex + qglColor(Qt::white); // Shorthand for glColor3f or glIndex glLineWidth( 2.0 ); @@ -206,8 +206,8 @@ void GLBox::setZRotation( int degrees ) } //! [1] -class ObjectSafetyImpl : public QAxAggregated, - public IObjectSafety +class ObjectSafetyImpl : public QAxAggregated, + public IObjectSafety { public: //! [1] //! [2] @@ -215,14 +215,14 @@ public: long queryInterface( const QUuid &iid, void **iface ) { - *iface = 0; - if ( iid == IID_IObjectSafety ) - *iface = (IObjectSafety*)this; - else - return E_NOINTERFACE; - - AddRef(); - return S_OK; + *iface = 0; + if ( iid == IID_IObjectSafety ) + *iface = (IObjectSafety*)this; + else + return E_NOINTERFACE; + + AddRef(); + return S_OK; } //! [2] //! [3] @@ -231,13 +231,13 @@ public: //! [3] //! [4] HRESULT WINAPI GetInterfaceSafetyOptions( REFIID riid, DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions ) { - *pdwSupportedOptions = INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACESAFE_FOR_UNTRUSTED_CALLER; - *pdwEnabledOptions = INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACESAFE_FOR_UNTRUSTED_CALLER; - return S_OK; + *pdwSupportedOptions = INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACESAFE_FOR_UNTRUSTED_CALLER; + *pdwEnabledOptions = INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACESAFE_FOR_UNTRUSTED_CALLER; + return S_OK; } HRESULT WINAPI SetInterfaceSafetyOptions( REFIID riid, DWORD pdwSupportedOptions, DWORD pdwEnabledOptions ) { - return S_OK; + return S_OK; } }; //! [4] //! [5] diff --git a/examples/activeqt/opengl/glbox.h b/examples/activeqt/opengl/glbox.h index fd62e94..b356056 100644 --- a/examples/activeqt/opengl/glbox.h +++ b/examples/activeqt/opengl/glbox.h @@ -52,7 +52,7 @@ #include class GLBox : public QGLWidget, - public QAxBindable + public QAxBindable { Q_OBJECT //! [0] //! [1] @@ -66,18 +66,18 @@ public: public slots: - void setXRotation( int degrees ); + void setXRotation( int degrees ); //! [1] - void setYRotation( int degrees ); - void setZRotation( int degrees ); + void setYRotation( int degrees ); + void setZRotation( int degrees ); protected: - void initializeGL(); - void paintGL(); - void resizeGL( int w, int h ); + void initializeGL(); + void paintGL(); + void resizeGL( int w, int h ); - virtual GLuint makeObject(); + virtual GLuint makeObject(); private: diff --git a/examples/activeqt/opengl/main.cpp b/examples/activeqt/opengl/main.cpp index f834a1b..8f62d59 100644 --- a/examples/activeqt/opengl/main.cpp +++ b/examples/activeqt/opengl/main.cpp @@ -55,12 +55,12 @@ #include QAXFACTORY_DEFAULT( GLBox, - "{5fd9c22e-ed45-43fa-ba13-1530bb6b03e0}", - "{33b051af-bb25-47cf-a390-5cfd2987d26a}", - "{8c996c29-eafa-46ac-a6f9-901951e765b5}", - "{2c3c183a-eeda-41a4-896e-3d9c12c3577d}", - "{83e16271-6480-45d5-aaf1-3f40b7661ae4}" - ) + "{5fd9c22e-ed45-43fa-ba13-1530bb6b03e0}", + "{33b051af-bb25-47cf-a390-5cfd2987d26a}", + "{8c996c29-eafa-46ac-a6f9-901951e765b5}", + "{2c3c183a-eeda-41a4-896e-3d9c12c3577d}", + "{83e16271-6480-45d5-aaf1-3f40b7661ae4}" + ) //! [0] //! [1] /* @@ -73,15 +73,15 @@ int main( int argc, char **argv ) QApplication a(argc,argv); if ( !QGLFormat::hasOpenGL() ) { - qWarning( "This system has no OpenGL support. Exiting." ); - return -1; + qWarning( "This system has no OpenGL support. Exiting." ); + return -1; } if ( !QAxFactory::isServer() ) { - GLObjectWindow w; - w.resize( 400, 350 ); - w.show(); - return a.exec(); + GLObjectWindow w; + w.resize( 400, 350 ); + w.show(); + return a.exec(); //! [1] //! [2] } return a.exec(); diff --git a/examples/activeqt/opengl/opengl.pro b/examples/activeqt/opengl/opengl.pro index 1cdd707..47693f4 100644 --- a/examples/activeqt/opengl/opengl.pro +++ b/examples/activeqt/opengl/opengl.pro @@ -1,14 +1,14 @@ TEMPLATE = app -TARGET = openglax +TARGET = openglax CONFIG += warn_off QT += widgets axserver opengl -HEADERS = glbox.h \ - globjwin.h -SOURCES = glbox.cpp \ - globjwin.cpp \ - main.cpp +HEADERS = glbox.h \ + globjwin.h +SOURCES = glbox.cpp \ + globjwin.cpp \ + main.cpp RC_FILE = opengl.rc diff --git a/examples/activeqt/qutlook/addressview.cpp b/examples/activeqt/qutlook/addressview.cpp index c9adc85..ef26ce0 100644 --- a/examples/activeqt/qutlook/addressview.cpp +++ b/examples/activeqt/qutlook/addressview.cpp @@ -74,9 +74,9 @@ AddressBookModel::AddressBookModel(AddressView *parent) session.Logon(); Outlook::MAPIFolder *folder = session.GetDefaultFolder(Outlook::olFolderContacts); contactItems = new Outlook::Items(folder->Items()); - connect(contactItems, SIGNAL(ItemAdd(IDispatch*)), parent, SLOT(updateOutlook())); - connect(contactItems, SIGNAL(ItemChange(IDispatch*)), parent, SLOT(updateOutlook())); - connect(contactItems, SIGNAL(ItemRemove()), parent, SLOT(updateOutlook())); + connect(contactItems, SIGNAL(ItemAdd(IDispatch*)), parent, SLOT(updateOutlook())); + connect(contactItems, SIGNAL(ItemChange(IDispatch*)), parent, SLOT(updateOutlook())); + connect(contactItems, SIGNAL(ItemRemove()), parent, SLOT(updateOutlook())); delete folder; } @@ -277,7 +277,7 @@ void AddressView::changeEntry() void AddressView::itemSelected(const QModelIndex &index) { if (!index.isValid()) - return; + return; QAbstractItemModel *model = treeView->model(); iFirstName->setText(model->data(model->index(index.row(), 0)).toString()); diff --git a/examples/activeqt/qutlook/qutlook.pro b/examples/activeqt/qutlook/qutlook.pro index 30d5bc5..3482e1c 100644 --- a/examples/activeqt/qutlook/qutlook.pro +++ b/examples/activeqt/qutlook/qutlook.pro @@ -1,6 +1,6 @@ #! [0] #! [1] TEMPLATE = app -TARGET = qutlook +TARGET = qutlook QT += widgets axcontainer TYPELIBS = $$system(dumpcpp -getfile {00062FFF-0000-0000-C000-000000000046}) diff --git a/examples/activeqt/simple/main.cpp b/examples/activeqt/simple/main.cpp index 9348e94..487ccfa 100644 --- a/examples/activeqt/simple/main.cpp +++ b/examples/activeqt/simple/main.cpp @@ -57,27 +57,27 @@ public: QSimpleAX(QWidget *parent = 0) : QWidget(parent) { - QVBoxLayout *vbox = new QVBoxLayout( this ); + QVBoxLayout *vbox = new QVBoxLayout( this ); slider = new QSlider( Qt::Horizontal, this ); - LCD = new QLCDNumber( 3, this ); - edit = new QLineEdit( this ); + LCD = new QLCDNumber( 3, this ); + edit = new QLineEdit( this ); - connect( slider, SIGNAL(valueChanged(int)), this, SLOT(setValue(int)) ); - connect( edit, SIGNAL(textChanged(QString)), this, SLOT(setText(QString)) ); + connect( slider, SIGNAL(valueChanged(int)), this, SLOT(setValue(int)) ); + connect( edit, SIGNAL(textChanged(QString)), this, SLOT(setText(QString)) ); - vbox->addWidget( slider ); - vbox->addWidget( LCD ); - vbox->addWidget( edit ); + vbox->addWidget( slider ); + vbox->addWidget( LCD ); + vbox->addWidget( edit ); } - QString text() const - { - return edit->text(); + QString text() const + { + return edit->text(); } int value() const { - return slider->value(); + return slider->value(); } signals: @@ -88,33 +88,33 @@ signals: public slots: void setText( const QString &string ) { - if ( !requestPropertyChange( "text" ) ) - return; + if ( !requestPropertyChange( "text" ) ) + return; - edit->blockSignals( true ); - edit->setText( string ); - edit->blockSignals( false ); - emit someSignal(); - emit textChanged( string ); + edit->blockSignals( true ); + edit->setText( string ); + edit->blockSignals( false ); + emit someSignal(); + emit textChanged( string ); - propertyChanged( "text" ); + propertyChanged( "text" ); } void about() { - QMessageBox::information( this, "About QSimpleAX", "This is a Qt widget, and this slot has been\n" - "called through ActiveX/OLE automation!" ); + QMessageBox::information( this, "About QSimpleAX", "This is a Qt widget, and this slot has been\n" + "called through ActiveX/OLE automation!" ); } void setValue( int i ) { - if ( !requestPropertyChange( "value" ) ) - return; - slider->blockSignals( true ); - slider->setValue( i ); - slider->blockSignals( false ); - LCD->display( i ); - emit valueChanged( i ); + if ( !requestPropertyChange( "value" ) ) + return; + slider->blockSignals( true ); + slider->setValue( i ); + slider->blockSignals( false ); + LCD->display( i ); + emit valueChanged( i ); - propertyChanged( "value" ); + propertyChanged( "value" ); } private: @@ -128,9 +128,9 @@ private: //! [1] QAXFACTORY_DEFAULT(QSimpleAX, - "{DF16845C-92CD-4AAB-A982-EB9840E74669}", - "{616F620B-91C5-4410-A74E-6B81C76FFFE0}", - "{E1816BBA-BF5D-4A31-9855-D6BA432055FF}", - "{EC08F8FC-2754-47AB-8EFE-56A54057F34E}", - "{A095BA0C-224F-4933-A458-2DD7F6B85D8F}") + "{DF16845C-92CD-4AAB-A982-EB9840E74669}", + "{616F620B-91C5-4410-A74E-6B81C76FFFE0}", + "{E1816BBA-BF5D-4A31-9855-D6BA432055FF}", + "{EC08F8FC-2754-47AB-8EFE-56A54057F34E}", + "{A095BA0C-224F-4933-A458-2DD7F6B85D8F}") //! [1] diff --git a/examples/activeqt/simple/simple.pro b/examples/activeqt/simple/simple.pro index da8a317..a512c81 100644 --- a/examples/activeqt/simple/simple.pro +++ b/examples/activeqt/simple/simple.pro @@ -1,10 +1,10 @@ TEMPLATE = app -TARGET = simpleax +TARGET = simpleax CONFIG += warn_off QT += widgets axserver -SOURCES = main.cpp +SOURCES = main.cpp RC_FILE = simple.rc # install diff --git a/examples/activeqt/webbrowser/main.cpp b/examples/activeqt/webbrowser/main.cpp index 1e4efb5..51a9dce 100644 --- a/examples/activeqt/webbrowser/main.cpp +++ b/examples/activeqt/webbrowser/main.cpp @@ -106,8 +106,8 @@ void MainWindow::on_WebBrowser_TitleChange(const QString &title) void MainWindow::on_WebBrowser_ProgressChange(int a, int b) { if (a <= 0 || b <= 0) { - pb->hide(); - return; + pb->hide(); + return; } pb->show(); pb->setRange(0, b); @@ -118,11 +118,11 @@ void MainWindow::on_WebBrowser_CommandStateChange(int cmd, bool on) { switch (cmd) { case 1: - actionForward->setEnabled(on); - break; + actionForward->setEnabled(on); + break; case 2: - actionBack->setEnabled(on); - break; + actionBack->setEnabled(on); + break; } } @@ -147,7 +147,7 @@ void MainWindow::on_actionNewWindow_triggered() MainWindow *window = new MainWindow; window->show(); if (addressEdit->text().isEmpty()) - return; + return; window->addressEdit->setText(addressEdit->text()); window->actionStop->setEnabled(true); window->on_actionGo_triggered(); @@ -156,9 +156,9 @@ void MainWindow::on_actionNewWindow_triggered() void MainWindow::on_actionAbout_triggered() { QMessageBox::about(this, tr("About WebBrowser"), - tr("This Example has been created using the ActiveQt integration into Qt Designer.\n" - "It demonstrates the use of QAxWidget to embed the Internet Explorer ActiveX\n" - "control into a Qt application.")); + tr("This Example has been created using the ActiveQt integration into Qt Designer.\n" + "It demonstrates the use of QAxWidget to embed the Internet Explorer ActiveX\n" + "control into a Qt application.")); } void MainWindow::on_actionAboutQt_triggered() diff --git a/examples/activeqt/webbrowser/webaxwidget.h b/examples/activeqt/webbrowser/webaxwidget.h index a5382d0..4a34a12 100644 --- a/examples/activeqt/webbrowser/webaxwidget.h +++ b/examples/activeqt/webbrowser/webaxwidget.h @@ -47,8 +47,8 @@ class WebAxWidget : public QAxWidget { public: - - WebAxWidget(QWidget* parent = 0, Qt::WindowFlags f = 0) + + WebAxWidget(QWidget* parent = 0, Qt::WindowFlags f = 0) : QAxWidget(parent, f) { } diff --git a/examples/activeqt/webbrowser/webbrowser.pro b/examples/activeqt/webbrowser/webbrowser.pro index 995906f..9fa342b 100644 --- a/examples/activeqt/webbrowser/webbrowser.pro +++ b/examples/activeqt/webbrowser/webbrowser.pro @@ -3,8 +3,8 @@ TEMPLATE = app QT += widgets axcontainer HEADERS = webaxwidget.h -SOURCES = main.cpp -FORMS = mainwindow.ui +SOURCES = main.cpp +FORMS = mainwindow.ui wincewm*: FORMS = mainwindow_windowsmobile.ui diff --git a/examples/activeqt/wrapper/main.cpp b/examples/activeqt/wrapper/main.cpp index 3f0cfb5..5c16f92 100644 --- a/examples/activeqt/wrapper/main.cpp +++ b/examples/activeqt/wrapper/main.cpp @@ -73,85 +73,85 @@ static const char *fileopen[] = { class ActiveQtFactory : public QAxFactory { public: - ActiveQtFactory( const QUuid &lib, const QUuid &app ) - : QAxFactory( lib, app ) + ActiveQtFactory( const QUuid &lib, const QUuid &app ) + : QAxFactory( lib, app ) {} QStringList featureList() const { - QStringList list; - list << "QCheckBox"; - list << "QRadioButton"; - list << "QPushButton"; - list << "QToolButton"; - return list; + QStringList list; + list << "QCheckBox"; + list << "QRadioButton"; + list << "QPushButton"; + list << "QToolButton"; + return list; } QObject *createObject(const QString &key) { - if ( key == "QCheckBox" ) - return new QCheckBox(0); - if ( key == "QRadioButton" ) - return new QRadioButton(0); - if ( key == "QPushButton" ) - return new QPushButton(0 ); - if ( key == "QToolButton" ) { - QToolButton *tb = new QToolButton(0); -// tb->setIcon( QPixmap(fileopen) ); - return tb; - } + if ( key == "QCheckBox" ) + return new QCheckBox(0); + if ( key == "QRadioButton" ) + return new QRadioButton(0); + if ( key == "QPushButton" ) + return new QPushButton(0 ); + if ( key == "QToolButton" ) { + QToolButton *tb = new QToolButton(0); +// tb->setIcon( QPixmap(fileopen) ); + return tb; + } - return 0; + return 0; } const QMetaObject *metaObject( const QString &key ) const { - if ( key == "QCheckBox" ) - return &QCheckBox::staticMetaObject; - if ( key == "QRadioButton" ) - return &QRadioButton::staticMetaObject; - if ( key == "QPushButton" ) - return &QPushButton::staticMetaObject; - if ( key == "QToolButton" ) - return &QToolButton::staticMetaObject; + if ( key == "QCheckBox" ) + return &QCheckBox::staticMetaObject; + if ( key == "QRadioButton" ) + return &QRadioButton::staticMetaObject; + if ( key == "QPushButton" ) + return &QPushButton::staticMetaObject; + if ( key == "QToolButton" ) + return &QToolButton::staticMetaObject; - return 0; + return 0; } QUuid classID( const QString &key ) const { - if ( key == "QCheckBox" ) - return "{6E795DE9-872D-43CF-A831-496EF9D86C68}"; - if ( key == "QRadioButton" ) - return "{AFCF78C8-446C-409A-93B3-BA2959039189}"; - if ( key == "QPushButton" ) - return "{2B262458-A4B6-468B-B7D4-CF5FEE0A7092}"; - if ( key == "QToolButton" ) - return "{7c0ffe7a-60c3-4666-bde2-5cf2b54390a1}"; + if ( key == "QCheckBox" ) + return "{6E795DE9-872D-43CF-A831-496EF9D86C68}"; + if ( key == "QRadioButton" ) + return "{AFCF78C8-446C-409A-93B3-BA2959039189}"; + if ( key == "QPushButton" ) + return "{2B262458-A4B6-468B-B7D4-CF5FEE0A7092}"; + if ( key == "QToolButton" ) + return "{7c0ffe7a-60c3-4666-bde2-5cf2b54390a1}"; - return QUuid(); + return QUuid(); } QUuid interfaceID( const QString &key ) const { - if ( key == "QCheckBox" ) - return "{4FD39DD7-2DE0-43C1-A8C2-27C51A052810}"; - if ( key == "QRadioButton" ) - return "{7CC8AE30-206C-48A3-A009-B0A088026C2F}"; - if ( key == "QPushButton" ) - return "{06831CC9-59B6-436A-9578-6D53E5AD03D3}"; - if ( key == "QToolButton" ) - return "{6726080f-d63d-4950-a366-9bf33e5cdf84}"; + if ( key == "QCheckBox" ) + return "{4FD39DD7-2DE0-43C1-A8C2-27C51A052810}"; + if ( key == "QRadioButton" ) + return "{7CC8AE30-206C-48A3-A009-B0A088026C2F}"; + if ( key == "QPushButton" ) + return "{06831CC9-59B6-436A-9578-6D53E5AD03D3}"; + if ( key == "QToolButton" ) + return "{6726080f-d63d-4950-a366-9bf33e5cdf84}"; - return QUuid(); + return QUuid(); } QUuid eventsID( const QString &key ) const { - if ( key == "QCheckBox" ) - return "{FDB6FFBE-56A3-4E90-8F4D-198488418B3A}"; - if ( key == "QRadioButton" ) - return "{73EE4860-684C-4A66-BF63-9B9EFFA0CBE5}"; - if ( key == "QPushButton" ) - return "{3CC3F17F-EA59-4B58-BBD3-842D467131DD}"; - if ( key == "QToolButton" ) - return "{f4d421fd-4ead-4fd9-8a25-440766939639}"; + if ( key == "QCheckBox" ) + return "{FDB6FFBE-56A3-4E90-8F4D-198488418B3A}"; + if ( key == "QRadioButton" ) + return "{73EE4860-684C-4A66-BF63-9B9EFFA0CBE5}"; + if ( key == "QPushButton" ) + return "{3CC3F17F-EA59-4B58-BBD3-842D467131DD}"; + if ( key == "QToolButton" ) + return "{f4d421fd-4ead-4fd9-8a25-440766939639}"; - return QUuid(); + return QUuid(); } }; //! [0] //! [1] diff --git a/examples/activeqt/wrapper/wrapper.pro b/examples/activeqt/wrapper/wrapper.pro index 8b59eb9..229f790 100644 --- a/examples/activeqt/wrapper/wrapper.pro +++ b/examples/activeqt/wrapper/wrapper.pro @@ -1,11 +1,11 @@ TEMPLATE = lib -TARGET = wrapperax +TARGET = wrapperax CONFIG += warn_off dll QT += widgets axserver -SOURCES = main.cpp -RC_FILE = wrapperax.rc +SOURCES = main.cpp +RC_FILE = wrapperax.rc DEF_FILE = wrapperax.def # install -- cgit v1.2.1