[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/kdesktop
From:       Laurent Montel <montel () kde ! org>
Date:       2005-09-12 12:02:44
Message-ID: 1126526564.796919.27574.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 459899 by mlaurent:

Use QLatin1String


 M  +4 -4      kdiconview.cc  
 M  +1 -1      krootwm.cc  
 M  +2 -2      lock/lockprocess.cc  
 M  +4 -4      minicli.cpp  


--- trunk/KDE/kdebase/kdesktop/kdiconview.cc #459898:459899
@@ -262,7 +262,7 @@
     m_bSortDirectoriesFirst = KDesktopSettings::directoriesFirst();
     m_itemsAlwaysFirst = KDesktopSettings::alwaysFirstItems(); // Distributor plug-in
 
-    if (KProtocolInfo::isKnownProtocol(QString::fromLatin1("media")))
+    if (KProtocolInfo::isKnownProtocol(QLatin1String("media")))
         m_enableMedia=KDesktopSettings::mediaEnabled();
     else
         m_enableMedia=false;
@@ -837,14 +837,14 @@
     return false;
 
   // return true if desktop file
-  return ( _item->mimetype() == QString::fromLatin1("application/x-desktop") );
+  return ( _item->mimetype() == QLatin1String("application/x-desktop") );
 }
 
 QString KDIconView::stripDesktopExtension( const QString & text )
 {
-    if (text.right(7) == QString::fromLatin1(".kdelnk"))
+    if (text.right(7) == QLatin1String(".kdelnk"))
       return text.left(text.length() - 7);
-    else if (text.right(8) == QString::fromLatin1(".desktop"))
+    else if (text.right(8) == QLatin1String(".desktop"))
       return text.left(text.length() - 8);
     return text;
 }
--- trunk/KDE/kdebase/kdesktop/krootwm.cc #459898:459899
@@ -730,7 +730,7 @@
   QStringList args = configModules();
   args.prepend(i18n("Desktop"));
   args.prepend("--caption");
-  KApplication::kdeinitExec(QString::fromLatin1("kcmshell"), args);
+  KApplication::kdeinitExec(QLatin1String("kcmshell"), args);
 }
 
 static void sendToAppropriate(const char* baseApp, const char* iface, const char* call)
--- trunk/KDE/kdebase/kdesktop/lock/lockprocess.cc #459898:459899
@@ -153,7 +153,7 @@
 
     QStringList dmopt =
         QStringList::split(QChar(','),
-                            QString::fromLatin1( ::getenv( "XDM_MANAGED" )));
+                            QLatin1String( ::getenv( "XDM_MANAGED" )));
     for (QStringList::ConstIterator it = dmopt.begin(); it != dmopt.end(); ++it)
         if ((*it).startsWith("method="))
             mMethod = (*it).mid(7);
@@ -684,7 +684,7 @@
 QVariant LockProcess::getConf(void *ctx, const char *key, const QVariant &dflt)
 {
     LockProcess *that = (LockProcess *)ctx;
-    QString fkey = QString::fromLatin1( key ) + '=';
+    QString fkey = QLatin1String( key ) + '=';
     for (QStringList::ConstIterator it = that->mPluginOptions.begin();
          it != that->mPluginOptions.end(); ++it)
         if ((*it).startsWith( fkey ))
--- trunk/KDE/kdebase/kdesktop/minicli.cpp #459898:459899
@@ -703,7 +703,7 @@
 void Minicli::setIcon ()
 {
   if( m_iconName.isEmpty() || m_iconName == "unknown" || m_iconName == "kde" )
-    m_iconName = QString::fromLatin1("kmenu");
+    m_iconName = QLatin1String("kmenu");
 
   QPixmap icon = DesktopIcon( m_iconName );
 
@@ -757,9 +757,9 @@
       m_prevChecked = m_dlg->cbRunAsOther->isChecked();
       m_prevCached = true;
     }
-    if (m_dlg->leUsername->text() != QString::fromLatin1("root"))
+    if (m_dlg->leUsername->text() != QLatin1String("root"))
       m_dlg->lePassword->setText(QString::null);
-    m_dlg->leUsername->setText(QString::fromLatin1("root"));
+    m_dlg->leUsername->setText(QLatin1String("root"));
     m_dlg->cbRunAsOther->setChecked(true);
     m_dlg->cbRunAsOther->setEnabled(false);
     m_dlg->leUsername->setEnabled(false);
@@ -804,7 +804,7 @@
   if (enable)
   {
     m_prevIconName = m_iconName;
-    m_iconName = QString::fromLatin1( "konsole" );
+    m_iconName = QLatin1String( "konsole" );
     setIcon();
   }
   else if (!m_prevIconName.isEmpty())
[prev in list] [next in list] [prev in thread] [next in thread]