diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-19 09:53:42 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-19 09:54:12 +0200 |
commit | 55a36aed7935984846db2342e37160057cb3bec8 (patch) | |
tree | b84f611333fe9ec6ecda62c9ea47f954f59bc394 /examples | |
parent | a9a87deb685600aebd9ed1cec82ad668afca88d9 (diff) | |
parent | 734324c37cb9d8417aa86f76fc81dadc21be2156 (diff) |
Merge remote-tracking branch 'gerrit/master' into newdocs
Change-Id: If7f46d56cf0b0b79f7fc8955a01964121b900d07
Diffstat (limited to 'examples')
-rw-r--r-- | examples/embedded/lightmaps/mapzoom.cpp | 4 | ||||
-rw-r--r-- | examples/network/fortuneclient/client.cpp | 4 | ||||
-rw-r--r-- | examples/network/fortuneserver/server.cpp | 4 | ||||
-rw-r--r-- | examples/network/network-chat/main.cpp | 4 | ||||
-rw-r--r-- | examples/network/torrent/mainwindow.cpp | 4 | ||||
-rw-r--r-- | examples/opengl/cube/mainwidget.cpp | 3 | ||||
-rw-r--r-- | examples/widgets/mainwindows/application/main.cpp | 2 | ||||
-rw-r--r-- | examples/widgets/mainwindows/application/mainwindow.cpp | 4 | ||||
-rw-r--r-- | examples/widgets/mainwindows/mdi/mainwindow.cpp | 4 | ||||
-rw-r--r-- | examples/widgets/mainwindows/recentfiles/main.cpp | 2 | ||||
-rw-r--r-- | examples/widgets/mainwindows/sdi/main.cpp | 2 |
11 files changed, 19 insertions, 18 deletions
diff --git a/examples/embedded/lightmaps/mapzoom.cpp b/examples/embedded/lightmaps/mapzoom.cpp index b0b583a88a..f2b1acbce1 100644 --- a/examples/embedded/lightmaps/mapzoom.cpp +++ b/examples/embedded/lightmaps/mapzoom.cpp @@ -75,7 +75,7 @@ MapZoom::MapZoom() QNetworkConfigurationManager manager; if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) { // Get saved network configuration - QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); + QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); settings.beginGroup(QLatin1String("QtNetwork")); const QString id = settings.value(QLatin1String("DefaultNetworkConfiguration")).toString(); @@ -112,7 +112,7 @@ void MapZoom::sessionOpened() id = config.identifier(); } - QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); + QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); settings.beginGroup(QLatin1String("QtNetwork")); settings.setValue(QLatin1String("DefaultNetworkConfiguration"), id); settings.endGroup(); diff --git a/examples/network/fortuneclient/client.cpp b/examples/network/fortuneclient/client.cpp index d0a37e051e..d3b6d902b7 100644 --- a/examples/network/fortuneclient/client.cpp +++ b/examples/network/fortuneclient/client.cpp @@ -129,7 +129,7 @@ Client::Client(QWidget *parent) QNetworkConfigurationManager manager; if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) { // Get saved network configuration - QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); + QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); settings.beginGroup(QLatin1String("QtNetwork")); const QString id = settings.value(QLatin1String("DefaultNetworkConfiguration")).toString(); settings.endGroup(); @@ -248,7 +248,7 @@ void Client::sessionOpened() else id = config.identifier(); - QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); + QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); settings.beginGroup(QLatin1String("QtNetwork")); settings.setValue(QLatin1String("DefaultNetworkConfiguration"), id); settings.endGroup(); diff --git a/examples/network/fortuneserver/server.cpp b/examples/network/fortuneserver/server.cpp index c0194328d1..94f934fc2d 100644 --- a/examples/network/fortuneserver/server.cpp +++ b/examples/network/fortuneserver/server.cpp @@ -55,7 +55,7 @@ Server::Server(QWidget *parent) QNetworkConfigurationManager manager; if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) { // Get saved network configuration - QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); + QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); settings.beginGroup(QLatin1String("QtNetwork")); const QString id = settings.value(QLatin1String("DefaultNetworkConfiguration")).toString(); settings.endGroup(); @@ -115,7 +115,7 @@ void Server::sessionOpened() else id = config.identifier(); - QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); + QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); settings.beginGroup(QLatin1String("QtNetwork")); settings.setValue(QLatin1String("DefaultNetworkConfiguration"), id); settings.endGroup(); diff --git a/examples/network/network-chat/main.cpp b/examples/network/network-chat/main.cpp index fab1c25580..4c3985cb5e 100644 --- a/examples/network/network-chat/main.cpp +++ b/examples/network/network-chat/main.cpp @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) QNetworkConfigurationManager manager; if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) { // Get saved network configuration - QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); + QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); settings.beginGroup(QLatin1String("QtNetwork")); const QString id = settings.value(QLatin1String("DefaultNetworkConfiguration")).toString(); settings.endGroup(); @@ -80,7 +80,7 @@ int main(int argc, char *argv[]) id = config.identifier(); } - QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); + QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); settings.beginGroup(QLatin1String("QtNetwork")); settings.setValue(QLatin1String("DefaultNetworkConfiguration"), id); settings.endGroup(); diff --git a/examples/network/torrent/mainwindow.cpp b/examples/network/torrent/mainwindow.cpp index 63f7245f54..1b10241f6e 100644 --- a/examples/network/torrent/mainwindow.cpp +++ b/examples/network/torrent/mainwindow.cpp @@ -234,7 +234,7 @@ int MainWindow::rowOfClient(TorrentClient *client) const void MainWindow::loadSettings() { // Load base settings (last working directory, upload/download limits). - QSettings settings("Trolltech", "Torrent"); + QSettings settings("QtProject", "Torrent"); lastDirectory = settings.value("LastDirectory").toString(); if (lastDirectory.isEmpty()) lastDirectory = QDir::currentPath(); @@ -411,7 +411,7 @@ void MainWindow::saveSettings() saveChanges = false; // Prepare and reset the settings - QSettings settings("Trolltech", "Torrent"); + QSettings settings("QtProject", "Torrent"); settings.clear(); settings.setValue("LastDirectory", lastDirectory); diff --git a/examples/opengl/cube/mainwidget.cpp b/examples/opengl/cube/mainwidget.cpp index c1001cda33..055dcf49cf 100644 --- a/examples/opengl/cube/mainwidget.cpp +++ b/examples/opengl/cube/mainwidget.cpp @@ -55,7 +55,8 @@ MainWidget::MainWidget(QWidget *parent) : QGLWidget(parent), timer(new QBasicTimer), program(new QGLShaderProgram), - geometries(new GeometryEngine) + geometries(new GeometryEngine), + angularSpeed(0) { } diff --git a/examples/widgets/mainwindows/application/main.cpp b/examples/widgets/mainwindows/application/main.cpp index 152dbe560c..bb4e072735 100644 --- a/examples/widgets/mainwindows/application/main.cpp +++ b/examples/widgets/mainwindows/application/main.cpp @@ -48,7 +48,7 @@ int main(int argc, char *argv[]) Q_INIT_RESOURCE(application); QApplication app(argc, argv); - app.setOrganizationName("Trolltech"); + app.setOrganizationName("QtProject"); app.setApplicationName("Application Example"); MainWindow mainWin; mainWin.show(); diff --git a/examples/widgets/mainwindows/application/mainwindow.cpp b/examples/widgets/mainwindows/application/mainwindow.cpp index 2b0cd72604..5cad03b331 100644 --- a/examples/widgets/mainwindows/application/mainwindow.cpp +++ b/examples/widgets/mainwindows/application/mainwindow.cpp @@ -276,7 +276,7 @@ void MainWindow::createStatusBar() void MainWindow::readSettings() //! [34] //! [36] { - QSettings settings("Trolltech", "Application Example"); + QSettings settings("QtProject", "Application Example"); QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint(); QSize size = settings.value("size", QSize(400, 400)).toSize(); resize(size); @@ -288,7 +288,7 @@ void MainWindow::readSettings() void MainWindow::writeSettings() //! [37] //! [39] { - QSettings settings("Trolltech", "Application Example"); + QSettings settings("QtProject", "Application Example"); settings.setValue("pos", pos()); settings.setValue("size", size()); } diff --git a/examples/widgets/mainwindows/mdi/mainwindow.cpp b/examples/widgets/mainwindows/mdi/mainwindow.cpp index 7a09268374..e40edc76be 100644 --- a/examples/widgets/mainwindows/mdi/mainwindow.cpp +++ b/examples/widgets/mainwindows/mdi/mainwindow.cpp @@ -362,7 +362,7 @@ void MainWindow::createStatusBar() void MainWindow::readSettings() { - QSettings settings("Trolltech", "MDI Example"); + QSettings settings("QtProject", "MDI Example"); QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint(); QSize size = settings.value("size", QSize(400, 400)).toSize(); move(pos); @@ -371,7 +371,7 @@ void MainWindow::readSettings() void MainWindow::writeSettings() { - QSettings settings("Trolltech", "MDI Example"); + QSettings settings("QtProject", "MDI Example"); settings.setValue("pos", pos()); settings.setValue("size", size()); } diff --git a/examples/widgets/mainwindows/recentfiles/main.cpp b/examples/widgets/mainwindows/recentfiles/main.cpp index 2a9b8caec9..c63ceefcf1 100644 --- a/examples/widgets/mainwindows/recentfiles/main.cpp +++ b/examples/widgets/mainwindows/recentfiles/main.cpp @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); - app.setOrganizationName("Trolltech"); + app.setOrganizationName("QtProject"); app.setApplicationName("Recent Files Example"); MainWindow *mainWin = new MainWindow; mainWin->show(); diff --git a/examples/widgets/mainwindows/sdi/main.cpp b/examples/widgets/mainwindows/sdi/main.cpp index 201ae62bc1..38e734e2e6 100644 --- a/examples/widgets/mainwindows/sdi/main.cpp +++ b/examples/widgets/mainwindows/sdi/main.cpp @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) Q_INIT_RESOURCE(sdi); QApplication app(argc, argv); app.setApplicationName("SDI Example"); - app.setOrganizationName("Trolltech"); + app.setOrganizationName("QtProject"); MainWindow *mainWin = new MainWindow; mainWin->show(); return app.exec(); |