1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use organization name "QtProject" in examples.

Browse Source 
Change-Id: Ibbe9517ccf81d25eccbdff98f7cfe8ff6ec485d2
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Friedemann Kleint 2012-10-16 10:23:43 +02:00 committed by The Qt Project
parent dc0927f2b8
commit fbd10a401f
10 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/embedded/lightmaps/mapzoom.cpp
View File

@ -75,7 +75,7 @@ MapZoom::MapZoom()
QNetworkConfigurationManager manager; QNetworkConfigurationManager manager;
if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) { if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) {
// Get saved network configuration // Get saved network configuration
QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); QSettings settings(QSettings::UserScope, QLatin1String("QtProject"));
settings.beginGroup(QLatin1String("QtNetwork")); settings.beginGroup(QLatin1String("QtNetwork"));
const QString id = const QString id =
settings.value(QLatin1String("DefaultNetworkConfiguration")).toString(); settings.value(QLatin1String("DefaultNetworkConfiguration")).toString();
@ -112,7 +112,7 @@ void MapZoom::sessionOpened()
id = config.identifier(); id = config.identifier();
} }
QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); QSettings settings(QSettings::UserScope, QLatin1String("QtProject"));
settings.beginGroup(QLatin1String("QtNetwork")); settings.beginGroup(QLatin1String("QtNetwork"));
settings.setValue(QLatin1String("DefaultNetworkConfiguration"), id); settings.setValue(QLatin1String("DefaultNetworkConfiguration"), id);
settings.endGroup(); settings.endGroup();

4
examples/network/fortuneclient/client.cpp
View File

@ -129,7 +129,7 @@ Client::Client(QWidget *parent)
QNetworkConfigurationManager manager; QNetworkConfigurationManager manager;
if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) { if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) {
// Get saved network configuration // Get saved network configuration
QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); QSettings settings(QSettings::UserScope, QLatin1String("QtProject"));
settings.beginGroup(QLatin1String("QtNetwork")); settings.beginGroup(QLatin1String("QtNetwork"));
const QString id = settings.value(QLatin1String("DefaultNetworkConfiguration")).toString(); const QString id = settings.value(QLatin1String("DefaultNetworkConfiguration")).toString();
settings.endGroup(); settings.endGroup();
@ -248,7 +248,7 @@ void Client::sessionOpened()
else else
id = config.identifier(); id = config.identifier();
QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); QSettings settings(QSettings::UserScope, QLatin1String("QtProject"));
settings.beginGroup(QLatin1String("QtNetwork")); settings.beginGroup(QLatin1String("QtNetwork"));
settings.setValue(QLatin1String("DefaultNetworkConfiguration"), id); settings.setValue(QLatin1String("DefaultNetworkConfiguration"), id);
settings.endGroup(); settings.endGroup();

4
examples/network/fortuneserver/server.cpp
View File

@ -55,7 +55,7 @@ Server::Server(QWidget *parent)
QNetworkConfigurationManager manager; QNetworkConfigurationManager manager;
if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) { if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) {
// Get saved network configuration // Get saved network configuration
QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); QSettings settings(QSettings::UserScope, QLatin1String("QtProject"));
settings.beginGroup(QLatin1String("QtNetwork")); settings.beginGroup(QLatin1String("QtNetwork"));
const QString id = settings.value(QLatin1String("DefaultNetworkConfiguration")).toString(); const QString id = settings.value(QLatin1String("DefaultNetworkConfiguration")).toString();
settings.endGroup(); settings.endGroup();
@ -115,7 +115,7 @@ void Server::sessionOpened()
else else
id = config.identifier(); id = config.identifier();
QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); QSettings settings(QSettings::UserScope, QLatin1String("QtProject"));
settings.beginGroup(QLatin1String("QtNetwork")); settings.beginGroup(QLatin1String("QtNetwork"));
settings.setValue(QLatin1String("DefaultNetworkConfiguration"), id); settings.setValue(QLatin1String("DefaultNetworkConfiguration"), id);
settings.endGroup(); settings.endGroup();

4
examples/network/network-chat/main.cpp
View File

@ -53,7 +53,7 @@ int main(int argc, char *argv[])
QNetworkConfigurationManager manager; QNetworkConfigurationManager manager;
if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) { if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) {
// Get saved network configuration // Get saved network configuration
QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); QSettings settings(QSettings::UserScope, QLatin1String("QtProject"));
settings.beginGroup(QLatin1String("QtNetwork")); settings.beginGroup(QLatin1String("QtNetwork"));
const QString id = settings.value(QLatin1String("DefaultNetworkConfiguration")).toString(); const QString id = settings.value(QLatin1String("DefaultNetworkConfiguration")).toString();
settings.endGroup(); settings.endGroup();
@ -80,7 +80,7 @@ int main(int argc, char *argv[])
id = config.identifier(); id = config.identifier();
} }
QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); QSettings settings(QSettings::UserScope, QLatin1String("QtProject"));
settings.beginGroup(QLatin1String("QtNetwork")); settings.beginGroup(QLatin1String("QtNetwork"));
settings.setValue(QLatin1String("DefaultNetworkConfiguration"), id); settings.setValue(QLatin1String("DefaultNetworkConfiguration"), id);
settings.endGroup(); settings.endGroup();

4
examples/network/torrent/mainwindow.cpp
View File

@ -234,7 +234,7 @@ int MainWindow::rowOfClient(TorrentClient *client) const
void MainWindow::loadSettings() void MainWindow::loadSettings()
{ {
// Load base settings (last working directory, upload/download limits). // Load base settings (last working directory, upload/download limits).
QSettings settings("Trolltech", "Torrent"); QSettings settings("QtProject", "Torrent");
lastDirectory = settings.value("LastDirectory").toString(); lastDirectory = settings.value("LastDirectory").toString();
if (lastDirectory.isEmpty()) if (lastDirectory.isEmpty())
lastDirectory = QDir::currentPath(); lastDirectory = QDir::currentPath();
@ -411,7 +411,7 @@ void MainWindow::saveSettings()
saveChanges = false; saveChanges = false;
// Prepare and reset the settings // Prepare and reset the settings
QSettings settings("Trolltech", "Torrent"); QSettings settings("QtProject", "Torrent");
settings.clear(); settings.clear();
settings.setValue("LastDirectory", lastDirectory); settings.setValue("LastDirectory", lastDirectory);

2
examples/widgets/mainwindows/application/main.cpp
View File

@ -48,7 +48,7 @@ int main(int argc, char *argv[])
Q_INIT_RESOURCE(application); Q_INIT_RESOURCE(application);
QApplication app(argc, argv); QApplication app(argc, argv);
app.setOrganizationName("Trolltech"); app.setOrganizationName("QtProject");
app.setApplicationName("Application Example"); app.setApplicationName("Application Example");
MainWindow mainWin; MainWindow mainWin;
mainWin.show(); mainWin.show();

4
examples/widgets/mainwindows/application/mainwindow.cpp
View File

@ -276,7 +276,7 @@ void MainWindow::createStatusBar()
void MainWindow::readSettings() void MainWindow::readSettings()
//! [34] //! [36] //! [34] //! [36]
{ {
QSettings settings("Trolltech", "Application Example"); QSettings settings("QtProject", "Application Example");
QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint(); QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint();
QSize size = settings.value("size", QSize(400, 400)).toSize(); QSize size = settings.value("size", QSize(400, 400)).toSize();
resize(size); resize(size);
@ -288,7 +288,7 @@ void MainWindow::readSettings()
void MainWindow::writeSettings() void MainWindow::writeSettings()
//! [37] //! [39] //! [37] //! [39]
{ {
QSettings settings("Trolltech", "Application Example"); QSettings settings("QtProject", "Application Example");
settings.setValue("pos", pos()); settings.setValue("pos", pos());
settings.setValue("size", size()); settings.setValue("size", size());
} }

4
examples/widgets/mainwindows/mdi/mainwindow.cpp
View File

@ -362,7 +362,7 @@ void MainWindow::createStatusBar()
void MainWindow::readSettings() void MainWindow::readSettings()
{ {
QSettings settings("Trolltech", "MDI Example"); QSettings settings("QtProject", "MDI Example");
QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint(); QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint();
QSize size = settings.value("size", QSize(400, 400)).toSize(); QSize size = settings.value("size", QSize(400, 400)).toSize();
move(pos); move(pos);
@ -371,7 +371,7 @@ void MainWindow::readSettings()
void MainWindow::writeSettings() void MainWindow::writeSettings()
{ {
QSettings settings("Trolltech", "MDI Example"); QSettings settings("QtProject", "MDI Example");
settings.setValue("pos", pos()); settings.setValue("pos", pos());
settings.setValue("size", size()); settings.setValue("size", size());
} }

2
examples/widgets/mainwindows/recentfiles/main.cpp
View File

@ -45,7 +45,7 @@
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
QApplication app(argc, argv); QApplication app(argc, argv);
app.setOrganizationName("Trolltech"); app.setOrganizationName("QtProject");
app.setApplicationName("Recent Files Example"); app.setApplicationName("Recent Files Example");
MainWindow *mainWin = new MainWindow; MainWindow *mainWin = new MainWindow;
mainWin->show(); mainWin->show();

2
examples/widgets/mainwindows/sdi/main.cpp
View File

@ -47,7 +47,7 @@ int main(int argc, char *argv[])
Q_INIT_RESOURCE(sdi); Q_INIT_RESOURCE(sdi);
QApplication app(argc, argv); QApplication app(argc, argv);
app.setApplicationName("SDI Example"); app.setApplicationName("SDI Example");
app.setOrganizationName("Trolltech"); app.setOrganizationName("QtProject");
MainWindow *mainWin = new MainWindow; MainWindow *mainWin = new MainWindow;
mainWin->show(); mainWin->show();
return app.exec(); return app.exec();