diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-09-12 12:45:04 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-13 10:10:11 +0200 |
| commit | 1ef71fcdb15ac0b93751142629b4a2d1ab1e73c8 (patch) | |
| tree | b72643001c9df648219f86e1ae01ed15c5baa18f /examples | |
| parent | 17294c00272651e926d516f2891b5b2a5af6285f (diff) | |
Rename the QtMacExtras namespace to QtMac
Change-Id: If6a01685a9fc5ff59dd02dbeeef7e8682cefae39
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/macfunctions/main.cpp | 6 | ||||
| -rw-r--r-- | examples/macunifiedtoolbar/preferenceswindow.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/examples/macfunctions/main.cpp b/examples/macfunctions/main.cpp index 43856fe..de77b08 100644 --- a/examples/macfunctions/main.cpp +++ b/examples/macfunctions/main.cpp @@ -57,12 +57,12 @@ int main(int argc, char **argv) QMenu menu; menu.addAction("Item 1"); menu.addAction("Item 2"); - QtMacExtras::setDockMenu(&menu); + QtMac::setDockMenu(&menu); // Pixmap <-> CGImage conversion QPixmap pixmap(":qtlogo.png"); - CGImageRef cgImage = QtMacExtras::toCGImageRef(pixmap); - QPixmap pixmap2 = QtMacExtras::fromCGImageRef(cgImage); + CGImageRef cgImage = QtMac::toCGImageRef(pixmap); + QPixmap pixmap2 = QtMac::fromCGImageRef(cgImage); return app.exec(); } diff --git a/examples/macunifiedtoolbar/preferenceswindow.cpp b/examples/macunifiedtoolbar/preferenceswindow.cpp index 488ef5f..4991023 100644 --- a/examples/macunifiedtoolbar/preferenceswindow.cpp +++ b/examples/macunifiedtoolbar/preferenceswindow.cpp @@ -55,7 +55,7 @@ PreferencesWindow::PreferencesWindow(QWidget *parent) : items->addAction(action); // This single line of code is all that's needed to transform a QToolBar into a native toolbar! - QtMacExtras::setNativeToolBar(ui->toolBar, ui->useNativeToolbarCheckBox->isChecked()); + QtMac::setNativeToolBar(ui->toolBar, ui->useNativeToolbarCheckBox->isChecked()); QTimer::singleShot(0, this, SLOT(pack())); } @@ -91,7 +91,7 @@ void PreferencesWindow::toolbarItemTriggered() void PreferencesWindow::useNativeToolBarToggled(bool on) { - QtMacExtras::setNativeToolBar(ui->toolBar, on); + QtMac::setNativeToolBar(ui->toolBar, on); QTimer::singleShot(0, this, SLOT(pack())); } |