X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=2a1ce6f460dce736ab0cdd390fabb5e5dcc1814a;hp=1399113c5e5fb9b605d3a953bb9ef13461dae095;hb=99678e189313b168c410fa15cd10cb673b73c8a2;hpb=c1572b1c1d6effb21083c6b09f08b30824827a98 diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 1399113c..2a1ce6f4 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -337,7 +337,7 @@ void MainWin::restoreStateFromSettings(UiSettings &s) void MainWin::updateIcon() { -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC const int size = 128; #else const int size = 48; @@ -402,7 +402,7 @@ void MainWin::setupActions() configureShortcutsAct->setMenuRole(QAction::NoRole); coll->addAction("ConfigureShortcuts", configureShortcutsAct); - #ifdef Q_WS_MAC + #ifdef Q_OS_MAC QAction *configureQuasselAct = new Action(SmallIcon("configure"), tr("&Configure Quassel..."), coll, this, SLOT(showSettingsDlg())); configureQuasselAct->setMenuRole(QAction::PreferencesRole); @@ -445,7 +445,7 @@ void MainWin::setupActions() this, SLOT(on_jumpHotBuffer_triggered()), QKeySequence(Qt::META + Qt::Key_A))); // Jump keys -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC const int bindModifier = Qt::ControlModifier | Qt::AltModifier; const int jumpModifier = Qt::ControlModifier; #else @@ -1000,7 +1000,7 @@ void MainWin::setupToolBars() connect(_nickListWidget, SIGNAL(nickSelectionChanged(QModelIndexList)), QtUi::toolBarActionProvider(), SLOT(nickSelectionChanged(QModelIndexList))); -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC setUnifiedTitleAndToolBarOnMac(true); #endif @@ -1016,7 +1016,7 @@ void MainWin::setupToolBars() QtUi::toolBarActionProvider()->addActions(_mainToolBar, ToolBarActionProvider::MainToolBar); _toolbarMenu->addAction(_mainToolBar->toggleViewAction()); -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC QtUiSettings uiSettings; bool visible = uiSettings.value("ShowMainToolBar", QVariant(true)).toBool(); @@ -1025,7 +1025,7 @@ void MainWin::setupToolBars() #endif } -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC void MainWin::saveMainToolBarStatus(bool enabled) { QtUiSettings uiSettings;