From f2799181f2f98dbd72cf3c80697f57162bdb9682 Mon Sep 17 00:00:00 2001 From: "craig.p.drummond" Date: Tue, 12 Jun 2012 20:41:08 +0000 Subject: [PATCH] Use Q_OS_XXX not Q_WS_XXX --- devices/filetyperesolver.cpp | 2 +- devices/utils.cpp | 8 ++-- devices/utils.h | 2 +- gui/covers.cpp | 8 ++-- gui/externalsettings.cpp | 6 +-- gui/mainwindow.cpp | 46 ++++++++++----------- gui/mainwindow.h | 20 ++++----- models/streamsmodel.cpp | 4 +- network/network.cpp | 4 +- qtsingleapplication/qtlockedfile.h | 22 +++++----- qtsingleapplication/qtsingleapplication.cpp | 22 +++++----- qtsingleapplication/qtsingleapplication.h | 24 +++++------ 12 files changed, 84 insertions(+), 84 deletions(-) diff --git a/devices/filetyperesolver.cpp b/devices/filetyperesolver.cpp index 22b476d41..dcc0124ef 100644 --- a/devices/filetyperesolver.cpp +++ b/devices/filetyperesolver.cpp @@ -141,7 +141,7 @@ TagLib::File *Meta::Tag::FileTypeResolver::createFile(TagLib::FileName fileName, result = new TagLib::ASF::File(fileName, readProperties, propertiesStyle); } -// #ifndef Q_WS_WIN +// #ifndef Q_OS_WIN // if( !result ) // qDebug() << "kmimetype filetype guessing failed for" << fileName; // #endif diff --git a/devices/utils.cpp b/devices/utils.cpp index 6d065baed..bb4681842 100644 --- a/devices/utils.cpp +++ b/devices/utils.cpp @@ -35,7 +35,7 @@ #include #include #include -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN #include #include #endif @@ -193,7 +193,7 @@ void Utils::cleanDir(const QString &dir, const QString &base, const QString &cov } } -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN gid_t Utils::getAudioGroupId() { static bool init=false; @@ -256,7 +256,7 @@ void Utils::setFilePerms(const QString &file) */ bool Utils::createDir(const QString &dir, const QString &base) { - #ifdef Q_WS_WIN + #ifdef Q_OS_WIN Q_UNUSED(base); #else // @@ -269,7 +269,7 @@ bool Utils::createDir(const QString &dir, const QString &base) #else bool status(QDir(dir).mkpath(dir)); #endif - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN if (status && 0!=gid && dir.startsWith(base)) { QStringList parts=dir.mid(base.length()).split('/'); QString d(base); diff --git a/devices/utils.h b/devices/utils.h index 12bd12aa8..c6a5bc637 100644 --- a/devices/utils.h +++ b/devices/utils.h @@ -45,7 +45,7 @@ namespace Utils extern QString changeExtension(const QString &file, const QString &extension); extern void moveDir(const QString &from, const QString &to, const QString &base, const QString &coverFile); extern void cleanDir(const QString &dir, const QString &base, const QString &coverFile, int level=0); - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN extern gid_t getAudioGroupId(); // Return 0 if user is not in audio group, otherwise returns audio group ID #endif extern void setFilePerms(const QString &file); diff --git a/gui/covers.cpp b/gui/covers.cpp index a54aa966a..c0fe84f63 100644 --- a/gui/covers.cpp +++ b/gui/covers.cpp @@ -128,7 +128,7 @@ static QString encodeName(QString name) return name; } -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN static QString xdgConfig() { QString env = QString::fromLocal8Bit(qgetenv("XDG_CONFIG_HOME")); @@ -509,7 +509,7 @@ Covers::Image Covers::getImage(const Song &song) Job job(song, dirName); - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN // See if amarok, or clementine, has it... AppCover app=otherAppCover(job); if (!app.img.isNull()) { @@ -682,7 +682,7 @@ void Covers::albumFailure(int, const QString &, QNetworkReply *reply) if (job.isArtist) { emit artistImage(job.song.albumartist, QImage()); } else { - #ifdef Q_WS_WIN + #ifdef Q_OS_WIN emit cover(job.song, QImage(), QString()); #else AppCover app=otherAppCover(job); @@ -722,7 +722,7 @@ void Covers::jobFinished(QNetworkReply *reply) if (job.isArtist) { emit artistImage(job.song.albumartist, img); } else if (img.isNull()) { - #ifdef Q_WS_WIN + #ifdef Q_OS_WIN emit cover(job.song, QImage(), QString()); #else AppCover app=otherAppCover(job); diff --git a/gui/externalsettings.cpp b/gui/externalsettings.cpp index 14830f6fb..109644ea3 100644 --- a/gui/externalsettings.cpp +++ b/gui/externalsettings.cpp @@ -30,7 +30,7 @@ ExternalSettings::ExternalSettings(QWidget *p) : QWidget(p) { setupUi(this); - #ifdef Q_WS_WIN + #ifdef Q_OS_WIN mprisLabel->setVisible(false); mpris->setVisible(false); dockManagerLabel->setVisible(false); @@ -42,7 +42,7 @@ void ExternalSettings::load() { systemTrayCheckBox->setChecked(Settings::self()->useSystemTray()); systemTrayPopup->setChecked(Settings::self()->showPopups()); - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN mpris->setChecked(Settings::self()->mpris()); dockManager->setChecked(Settings::self()->dockManager()); #endif @@ -52,7 +52,7 @@ void ExternalSettings::save() { Settings::self()->saveUseSystemTray(systemTrayCheckBox->isChecked()); Settings::self()->saveShowPopups(systemTrayPopup->isChecked()); - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN Settings::self()->saveMpris(mpris->isChecked()); Settings::self()->saveDockManager(dockManager->isChecked()); #endif diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 989bb93bc..e5c0b0a01 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -94,7 +94,7 @@ #include "playlistspage.h" #include "fancytabwidget.h" #include "timeslider.h" -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN #include "mpris.h" #include "dockmanager.h" #include "dynamicpage.h" @@ -330,7 +330,7 @@ MainWindow::MainWindow(QWidget *parent) #ifdef ENABLE_WEBKIT , infoNeedsUpdating(false) #endif - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN , dock(0) , mpris(0) #endif @@ -346,7 +346,7 @@ MainWindow::MainWindow(QWidget *parent) , phononStream(0) #endif { - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN new CantataAdaptor(this); QDBusConnection::sessionBus().registerObject("/cantata", this); #endif @@ -508,7 +508,7 @@ MainWindow::MainWindow(QWidget *parent) playlistsTabAction = actionCollection()->addAction("showplayliststab"); playlistsTabAction->setText(i18n("Playlists")); - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN dynamicTabAction = actionCollection()->addAction("showdynamictab"); dynamicTabAction->setText(i18n("Dynamic")); #endif @@ -596,7 +596,7 @@ MainWindow::MainWindow(QWidget *parent) albumsTabAction = new QAction(tr("Albums"), this); foldersTabAction = new QAction(tr("Folders"), this); playlistsTabAction = new QAction(tr("Playlists"), this); - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN dynamicTabAction = new QAction(tr("Dynamic"), this); #endif lyricsTabAction = new QAction(tr("Lyrics"), this); @@ -611,7 +611,7 @@ MainWindow::MainWindow(QWidget *parent) albumsTabAction->setShortcut(Qt::AltModifier+(pageKey++)); foldersTabAction->setShortcut(Qt::AltModifier+(pageKey++)); playlistsTabAction->setShortcut(Qt::AltModifier+(pageKey++)); - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN dynamicTabAction->setShortcut(Qt::AltModifier+(pageKey++)); #endif streamsTabAction->setShortcut(Qt::AltModifier+(pageKey++)); @@ -707,7 +707,7 @@ MainWindow::MainWindow(QWidget *parent) albumsTabAction->setIcon(Icon(DEFAULT_ALBUM_ICON)); foldersTabAction->setIcon(Icon("inode-directory")); playlistsTabAction->setIcon(Icon("view-media-playlist")); - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN dynamicTabAction->setIcon(Icon("media-playlist-shuffle")); #endif lyricsTabAction->setIcon(Icon("view-media-lyrics")); @@ -753,7 +753,7 @@ MainWindow::MainWindow(QWidget *parent) albumsPage = new AlbumsPage(this); folderPage = new FolderPage(this); playlistsPage = new PlaylistsPage(this); - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN dynamicPage = new DynamicPage(this); #endif streamsPage = new StreamsPage(this); @@ -787,7 +787,7 @@ MainWindow::MainWindow(QWidget *parent) tabWidget->AddTab(albumsPage, albumsTabAction->icon(), albumsTabAction->text(), !hiddenPages.contains(albumsPage->metaObject()->className())); tabWidget->AddTab(folderPage, foldersTabAction->icon(), foldersTabAction->text(), !hiddenPages.contains(folderPage->metaObject()->className())); tabWidget->AddTab(playlistsPage, playlistsTabAction->icon(), playlistsTabAction->text(), !hiddenPages.contains(playlistsPage->metaObject()->className())); - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN tabWidget->AddTab(dynamicPage, dynamicTabAction->icon(), dynamicTabAction->text(), !hiddenPages.contains(dynamicPage->metaObject()->className())); #endif tabWidget->AddTab(streamsPage, streamsTabAction->icon(), streamsTabAction->text(), !hiddenPages.contains(streamsPage->metaObject()->className())); @@ -966,7 +966,7 @@ MainWindow::MainWindow(QWidget *parent) connect(MPDConnection::self(), SIGNAL(stateChanged(bool)), SLOT(mpdConnectionStateChanged(bool))); connect(MPDConnection::self(), SIGNAL(error(const QString &, bool)), SLOT(showError(const QString &, bool))); connect(MPDConnection::self(), SIGNAL(dirChanged()), SLOT(checkMpdDir())); - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN connect(Dynamic::self(), SIGNAL(error(const QString &)), SLOT(showError(const QString &))); connect(Dynamic::self(), SIGNAL(running(bool)), dynamicLabel, SLOT(setVisible(bool))); #endif @@ -1017,7 +1017,7 @@ MainWindow::MainWindow(QWidget *parent) connect(albumsTabAction, SIGNAL(activated()), this, SLOT(showAlbumsTab())); connect(foldersTabAction, SIGNAL(activated()), this, SLOT(showFoldersTab())); connect(playlistsTabAction, SIGNAL(activated()), this, SLOT(showPlaylistsTab())); - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN connect(dynamicTabAction, SIGNAL(activated()), this, SLOT(showDynamicTab())); #endif connect(lyricsTabAction, SIGNAL(activated()), this, SLOT(showLyricsTab())); @@ -1095,7 +1095,7 @@ MainWindow::MainWindow(QWidget *parent) updateConnectionsMenu(); fadeStop=Settings::self()->stopFadeDuration()>Settings::MinFade; playlistsPage->refresh(); - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN toggleMpris(); if (Settings::self()->dockManager()) { QTimer::singleShot(250, this, SLOT(toggleDockManager())); @@ -1105,7 +1105,7 @@ MainWindow::MainWindow(QWidget *parent) MainWindow::~MainWindow() { - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN if (dock) { dock->setIcon(QString()); } @@ -1143,7 +1143,7 @@ MainWindow::~MainWindow() #endif Settings::self()->save(true); disconnect(MPDConnection::self(), 0, 0, 0); - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN if (Settings::self()->stopDynamizerOnExit() || Settings::self()->stopOnExit()) { Dynamic::self()->stop(); } @@ -1246,7 +1246,7 @@ void MainWindow::songLoaded() void MainWindow::showError(const QString &message, bool showActions) { - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN if (QLatin1String("NO_SONGS")==message) { messageWidget->setError(i18n("Failed to locate any songs matching the dynamic playlist rules.")); } else @@ -1361,7 +1361,7 @@ void MainWindow::connectToMpd(const MPDConnectionDetails &details) playQueueModel.clear(); lyricsPage->text->clear(); serverInfoPage->clear(); - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN Dynamic::self()->stop(); #endif showInformation(i18n("Connecting to %1").arg(details.description())); @@ -1435,7 +1435,7 @@ void MainWindow::checkMpdDir() case PAGE_ALBUMS: albumsPage->controlActions(); break; case PAGE_FOLDERS: folderPage->controlActions(); break; case PAGE_PLAYLISTS: playlistsPage->controlActions(); break; - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN case PAGE_DYNAMIC: dynamicPage->controlActions(); break; #endif case PAGE_STREAMS: streamsPage->controlActions(); break; @@ -1551,7 +1551,7 @@ void MainWindow::readSettings() devicesPage->setView(0==Settings::self()->devicesView()); #endif setupTrayIcon(); - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN toggleDockManager(); toggleMpris(); #endif @@ -2630,7 +2630,7 @@ void MainWindow::currentTabChanged(int index) case PAGE_PLAYLISTS: playlistsPage->controlActions(); break; - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN case PAGE_DYNAMIC: dynamicPage->controlActions(); break; @@ -2716,7 +2716,7 @@ void MainWindow::showPage(const QString &page, bool focusSearch) } else if (QLatin1String("playlists")==p) { showTab(MainWindow::PAGE_PLAYLISTS); } - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN else if (QLatin1String("dynamic")==p) { showTab(MainWindow::PAGE_DYNAMIC); } @@ -2740,7 +2740,7 @@ void MainWindow::showPage(const QString &page, bool focusSearch) } } -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN void MainWindow::dynamicStatus(const QString &message) { Dynamic::self()->helperMessage(message); @@ -2775,7 +2775,7 @@ void MainWindow::focusTabSearch() } else if (playlistsPage->isVisible()) { playlistsPage->focusSearch(); } - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN else if (dynamicPage->isVisible()) { dynamicPage->focusSearch(); } @@ -2811,7 +2811,7 @@ void MainWindow::collapseAll() } } -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN void MainWindow::toggleMpris() { bool on=Settings::self()->mpris(); diff --git a/gui/mainwindow.h b/gui/mainwindow.h index 3a9185f16..344e7eb81 100644 --- a/gui/mainwindow.h +++ b/gui/mainwindow.h @@ -68,7 +68,7 @@ class LibraryPage; class AlbumsPage; class FolderPage; class PlaylistsPage; -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN class DynamicPage; #endif class LyricsPage; @@ -80,7 +80,7 @@ class DevicesPage; #endif class QThread; class QAbstractItemView; -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN class DockManager; class Mpris; #endif @@ -172,7 +172,7 @@ public: PAGE_ALBUMS, PAGE_FOLDERS, PAGE_PLAYLISTS, - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN PAGE_DYNAMIC, #endif PAGE_STREAMS, @@ -230,7 +230,7 @@ public Q_SLOTS: void showError(const QString &message, bool showActions=false); void showInformation(const QString &message); void showPage(const QString &page, bool focusSearch); - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN void dynamicStatus(const QString &message); #endif @@ -297,7 +297,7 @@ private Q_SLOTS: void showAlbumsTab() { showTab(PAGE_ALBUMS); } void showFoldersTab() { showTab(PAGE_FOLDERS); } void showPlaylistsTab() { showTab(PAGE_PLAYLISTS); } - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN void showDynamicTab() { showTab(PAGE_DYNAMIC); } #endif void showStreamsTab() { showTab(PAGE_STREAMS); } @@ -309,7 +309,7 @@ private Q_SLOTS: #ifdef ENABLE_KDE_SUPPORT void showDevicesTab() { showTab(PAGE_DEVICES); } #endif - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN void toggleMpris(); void toggleDockManager(); #endif @@ -396,7 +396,7 @@ private: Action *albumsTabAction; Action *foldersTabAction; Action *playlistsTabAction; - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN Action *dynamicTabAction; #endif Action *lyricsTabAction; @@ -448,7 +448,7 @@ private: AlbumsPage *albumsPage; FolderPage *folderPage; PlaylistsPage *playlistsPage; - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN DynamicPage *dynamicPage; #endif LyricsPage *lyricsPage; @@ -461,7 +461,7 @@ private: #endif ServerInfoPage *serverInfoPage; QThread *mpdThread; - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN DockManager *dock; Mpris *mpris; #endif @@ -499,7 +499,7 @@ private: friend class AlbumsPage; friend class FolderPage; friend class PlaylistsPage; - #ifndef Q_WS_WIN + #ifndef Q_OS_WIN friend class DynamicPage; #endif friend class StreamsPage; diff --git a/models/streamsmodel.cpp b/models/streamsmodel.cpp index deaa5f4a7..2546aed69 100644 --- a/models/streamsmodel.cpp +++ b/models/streamsmodel.cpp @@ -33,7 +33,7 @@ #include #include #include -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN #include #endif #include "localize.h" @@ -53,7 +53,7 @@ static bool iconIsValid(const QString &icon) static QString configDir() { - #ifdef Q_WS_WIN + #ifdef Q_OS_WIN QString dir = QDesktopServices::storageLocation(QDesktopServices::DataLocation)+"/"; #else QString env = qgetenv("XDG_CONFIG_HOME"); diff --git a/network/network.cpp b/network/network.cpp index d36903dbb..571dd97bc 100644 --- a/network/network.cpp +++ b/network/network.cpp @@ -30,7 +30,7 @@ #include #include #include -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN #include #endif #ifdef ENABLE_KDE_SUPPORT @@ -40,7 +40,7 @@ K_GLOBAL_STATIC(Network, instance) QString Network::cacheDir(const QString &sub, bool create) { - #ifdef Q_WS_WIN + #ifdef Q_OS_WIN QString dir = QDesktopServices::storageLocation(QDesktopServices::CacheLocation)+"/"; #else QString env = qgetenv("XDG_CACHE_HOME"); diff --git a/qtsingleapplication/qtlockedfile.h b/qtsingleapplication/qtlockedfile.h index 1d3b918ec..969f4be22 100644 --- a/qtsingleapplication/qtlockedfile.h +++ b/qtsingleapplication/qtlockedfile.h @@ -1,17 +1,17 @@ /**************************************************************************** -** +** ** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) -** +** ** This file is part of a Qt Solutions component. ** -** Commercial Usage +** Commercial Usage ** Licensees holding valid Qt Commercial licenses may use this file in ** accordance with the Qt Solutions Commercial License Agreement provided ** with the Software or, alternatively, in accordance with the terms ** contained in a written agreement between you and Nokia. -** +** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser ** General Public License version 2.1 as published by the Free Software @@ -19,29 +19,29 @@ ** packaging of this file. Please review the following information to ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** +** ** In addition, as a special exception, Nokia gives you certain ** additional rights. These rights are described in the Nokia Qt LGPL ** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this ** package. -** -** GNU General Public License Usage +** +** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU ** General Public License version 3.0 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. Please review the following information to ** ensure the GNU General Public License version 3.0 requirements will be ** met: http://www.gnu.org/copyleft/gpl.html. -** +** ** Please note Third Party Software included with Qt Solutions may impose ** additional restrictions and it is the user's responsibility to ensure ** that they have met the licensing requirements of the GPL, LGPL, or Qt ** Solutions Commercial license and the relevant license of the Third ** Party Software they are using. -** +** ** If you are unsure which license is appropriate for your use, please ** contact Nokia at qt-info@nokia.com. -** +** ****************************************************************************/ #ifndef QTLOCKEDFILE_H @@ -52,7 +52,7 @@ #include #endif -#if defined(Q_WS_WIN) +#if defined(Q_OS_WIN) # if !defined(QT_QTLOCKEDFILE_EXPORT) && !defined(QT_QTLOCKEDFILE_IMPORT) # define QT_QTLOCKEDFILE_EXPORT # elif defined(QT_QTLOCKEDFILE_IMPORT) diff --git a/qtsingleapplication/qtsingleapplication.cpp b/qtsingleapplication/qtsingleapplication.cpp index a7e19eed1..7fe264096 100644 --- a/qtsingleapplication/qtsingleapplication.cpp +++ b/qtsingleapplication/qtsingleapplication.cpp @@ -1,17 +1,17 @@ /**************************************************************************** -** +** ** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) -** +** ** This file is part of a Qt Solutions component. ** -** Commercial Usage +** Commercial Usage ** Licensees holding valid Qt Commercial licenses may use this file in ** accordance with the Qt Solutions Commercial License Agreement provided ** with the Software or, alternatively, in accordance with the terms ** contained in a written agreement between you and Nokia. -** +** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser ** General Public License version 2.1 as published by the Free Software @@ -19,29 +19,29 @@ ** packaging of this file. Please review the following information to ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** +** ** In addition, as a special exception, Nokia gives you certain ** additional rights. These rights are described in the Nokia Qt LGPL ** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this ** package. -** -** GNU General Public License Usage +** +** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU ** General Public License version 3.0 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. Please review the following information to ** ensure the GNU General Public License version 3.0 requirements will be ** met: http://www.gnu.org/copyleft/gpl.html. -** +** ** Please note Third Party Software included with Qt Solutions may impose ** additional restrictions and it is the user's responsibility to ensure ** that they have met the licensing requirements of the GPL, LGPL, or Qt ** Solutions Commercial license and the relevant license of the Third ** Party Software they are using. -** +** ** If you are unsure which license is appropriate for your use, please ** contact Nokia at qt-info@nokia.com. -** +** ****************************************************************************/ @@ -191,7 +191,7 @@ QtSingleApplication::QtSingleApplication(int &argc, char **argv, Type type) } -#if defined(Q_WS_X11) +#if defined (Q_OS_LINUX) || defined (Q_OS_SOLARIS) || defined (Q_OS_FREEBSD) || defined (Q_OS_OPENBSD) || defined (Q_OS_IRIX) /*! Special constructor for X11, ref. the documentation of QApplication's corresponding constructor. The application identifier diff --git a/qtsingleapplication/qtsingleapplication.h b/qtsingleapplication/qtsingleapplication.h index ba0507cb8..c0e0dd7fb 100644 --- a/qtsingleapplication/qtsingleapplication.h +++ b/qtsingleapplication/qtsingleapplication.h @@ -1,17 +1,17 @@ /**************************************************************************** -** +** ** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) -** +** ** This file is part of a Qt Solutions component. ** -** Commercial Usage +** Commercial Usage ** Licensees holding valid Qt Commercial licenses may use this file in ** accordance with the Qt Solutions Commercial License Agreement provided ** with the Software or, alternatively, in accordance with the terms ** contained in a written agreement between you and Nokia. -** +** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser ** General Public License version 2.1 as published by the Free Software @@ -19,29 +19,29 @@ ** packaging of this file. Please review the following information to ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** +** ** In addition, as a special exception, Nokia gives you certain ** additional rights. These rights are described in the Nokia Qt LGPL ** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this ** package. -** -** GNU General Public License Usage +** +** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU ** General Public License version 3.0 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. Please review the following information to ** ensure the GNU General Public License version 3.0 requirements will be ** met: http://www.gnu.org/copyleft/gpl.html. -** +** ** Please note Third Party Software included with Qt Solutions may impose ** additional restrictions and it is the user's responsibility to ensure ** that they have met the licensing requirements of the GPL, LGPL, or Qt ** Solutions Commercial license and the relevant license of the Third ** Party Software they are using. -** +** ** If you are unsure which license is appropriate for your use, please ** contact Nokia at qt-info@nokia.com. -** +** ****************************************************************************/ @@ -49,7 +49,7 @@ class QtLocalPeer; -#if defined(Q_WS_WIN) +#if defined(Q_OS_WIN) # if !defined(QT_QTSINGLEAPPLICATION_EXPORT) && !defined(QT_QTSINGLEAPPLICATION_IMPORT) # define QT_QTSINGLEAPPLICATION_EXPORT # elif defined(QT_QTSINGLEAPPLICATION_IMPORT) @@ -73,7 +73,7 @@ public: QtSingleApplication(int &argc, char **argv, bool GUIenabled = true); QtSingleApplication(const QString &id, int &argc, char **argv); QtSingleApplication(int &argc, char **argv, Type type); -#if defined(Q_WS_X11) +#if defined (Q_OS_LINUX) || defined (Q_OS_SOLARIS) || defined (Q_OS_FREEBSD) || defined (Q_OS_OPENBSD) || defined (Q_OS_IRIX) QtSingleApplication(Display* dpy, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0); QtSingleApplication(Display *dpy, int &argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE cmap= 0); QtSingleApplication(Display* dpy, const QString &appId, int argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0);