mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-29 12:19:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

QLatin1String fixes all over.

Browse source
This commit is contained in:
Klaas Freitag 2012-08-02 12:17:24 +03:00
parent 35e92030f8
commit bdb35f508a
4 changed files with 23 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mirall/application.cpp
View file

@ -482,7 +482,7 @@ void Application::slotAddFolder()
QString alias = _folderWizard->field("alias").toString();
QString sourceFolder = _folderWizard->field("sourceFolder").toString();
QString backend = QString::fromLocal8Bit("csync");
QString backend = QLatin1String("csync");
QString targetPath;
bool onlyThisLAN = false;
bool onlyOnline = false;
@ -497,7 +497,7 @@ void Application::slotAddFolder()
onlyThisLAN = _folderWizard->field("onlyThisLAN?").toBool();
} else if( _folderWizard->field("OC?").toBool()) {
// setup a ownCloud folder
backend = QString::fromLocal8Bit("owncloud");
backend = QLatin1String("owncloud");
targetPath = _folderWizard->field("targetOCFolder").toString();
} else {
qWarning() << "* Folder not local and note remote?";

2
src/mirall/owncloudinfo.cpp
View file

@ -90,7 +90,7 @@ bool ownCloudInfo::isConfigured()
void ownCloudInfo::checkInstallation()
{
getRequest( "status.php", false );
getRequest( QLatin1String("status.php"), false );
}
void ownCloudInfo::getWebDAVPath( const QString& path )

41
src/mirall/owncloudtheme.cpp
View file

@ -34,29 +34,29 @@ QString ownCloudTheme::appName() const
QString ownCloudTheme::configFileName() const
{
return QString::fromLocal8Bit("owncloud.cfg");
return QLatin1String("owncloud.cfg");
}
QPixmap ownCloudTheme::splashScreen() const
{
return QPixmap(":/mirall/resources/owncloud_splash.png");
return QPixmap(QLatin1String(":/mirall/resources/owncloud_splash.png"));
}
QIcon ownCloudTheme::folderIcon( const QString& backend ) const
{
QString name;
if( backend == QString::fromLatin1("owncloud")) {
name = QString( "owncloud-icon-framed" );
if( backend == QLatin1String("owncloud")) {
name = QLatin1String( "owncloud-icon-framed" );
}
if( backend == QString::fromLatin1("unison" )) {
name = QString( "folder-sync" );
if( backend == QLatin1String("unison" )) {
name = QLatin1String( "folder-sync" );
}
if( backend == QString::fromLatin1("csync" )) {
name = QString( "folder-remote" );
if( backend == QLatin1String("csync" )) {
name = QLatin1String( "folder-remote" );
}
if( backend.isEmpty() || backend == QString::fromLatin1("none") ) {
name = QString("folder-grey.png");
if( backend.isEmpty() || backend == QLatin1String("none") ) {
name = QLatin1String("folder-grey");
}
qDebug() << "==> load folder icon " << name;
@ -68,7 +68,6 @@ QIcon ownCloudTheme::trayFolderIcon( const QString& ) const
return themeIcon( "owncloud-icon" );
}
QIcon ownCloudTheme::syncStateIcon( SyncResult::Status status ) const
{
// FIXME: Mind the size!
@ -76,42 +75,40 @@ QIcon ownCloudTheme::syncStateIcon( SyncResult::Status status ) const
switch( status ) {
case SyncResult::Undefined:
statusIcon = "owncloud-icon-error";
statusIcon = QLatin1String("owncloud-icon-error");
break;
case SyncResult::NotYetStarted:
statusIcon = "owncloud-icon";
statusIcon = QLatin1String("owncloud-icon");
break;
case SyncResult::SyncRunning:
statusIcon = "owncloud-icon-sync";
statusIcon = QLatin1String("owncloud-icon-sync");
break;
case SyncResult::Success:
statusIcon = "owncloud-icon-sync-ok";
statusIcon = QLatin1String("owncloud-icon-sync-ok");
break;
case SyncResult::Error:
statusIcon = "owncloud-icon-error";
statusIcon = QLatin1String("owncloud-icon-error");
break;
case SyncResult::SetupError:
statusIcon = "owncloud-icon-error";
statusIcon = QLatin1String("owncloud-icon-error");
break;
default:
statusIcon = "owncloud-icon-error";
statusIcon = QLatin1String("owncloud-icon-error");
}
return themeIcon( statusIcon );
}
QIcon ownCloudTheme::folderDisabledIcon( ) const
{
// Fixme: Do we really want the dialog-canel from theme here?
return themeIcon( "owncloud-icon-error" );
return themeIcon( QLatin1String("owncloud-icon-error") );
}
QIcon ownCloudTheme::applicationIcon( ) const
{
return themeIcon( "owncloud-icon" );
return themeIcon( QLatin1String("owncloud-icon") );
}
}

2
src/mirall/owncloudwizard.cpp
View file

@ -103,7 +103,7 @@ void OwncloudSetupPage::setOCUrl( const QString& newUrl )
void OwncloudSetupPage::setupCustomization()
{
// set defaults for the customize labels.
_ui.sideLabel->setText( QString() );
_ui.sideLabel->setText( QString::null );
_ui.sideLabel->setFixedWidth(160);
_ui.topLabel->hide();