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

List:       kde-commits
Subject:    KDE/kdelibs/kinit
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2008-05-03 8:57:39
Message-ID: 1209805059.796440.21421.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 803531 by chehrlic:

getenv() -> qgetenv()

 M  +12 -12    kinit.cpp  
 M  +2 -2      kioslave.cpp  
 M  +3 -3      klauncher.cpp  


--- trunk/KDE/kdelibs/kinit/kinit.cpp #803530:803531
@@ -387,9 +387,9 @@
              paths = QString(path).split( QRegExp( "[:\b]" ));
      }
      else
-         paths = QString( getenv("PATH") ).split( QRegExp( "[:\b]" ), \
QString::KeepEmptyParts ); +         paths = QString::fromLocal8Bit( qgetenv("PATH") \
).split( QRegExp( "[:\b]" ), QString::KeepEmptyParts );  QByteArray execpath = \
                QFile::encodeName(
-         s_instance->dirs()->findExe( exec, paths.join( QString( ":" ))));
+         s_instance->dirs()->findExe( exec, paths.join( QLatin1String( ":" ))));
      if( avoid_loops && !execpath.isEmpty())
      {
          int pos = execpath.lastIndexOf( '/' );
@@ -823,9 +823,9 @@
   //struct sockaddr_un sa_old;
   kde_socklen_t socklen;
   long options;
-  const char *home_dir = getenv("HOME");
+  const QByteArray home_dir = qgetenv("HOME");
   int max_tries = 10;
-  if (!home_dir || !home_dir[0])
+  if (home_dir.isEmpty())
   {
      fprintf(stderr, "kdeinit4: Aborting. $HOME not set!");
      exit(255);
@@ -849,7 +849,7 @@
        }
      }
 #if 0 // obsolete in kde4. Should we check writing to another file instead?
-     path = getenv("ICEAUTHORITY");
+     path = qgetenv("ICEAUTHORITY");
      if (path.isEmpty())
      {
         path = home_dir;
@@ -1215,8 +1215,8 @@
      }
 
       // support for the old a bit broken way of setting DISPLAY for multihead
-      QByteArray olddisplay = getenv(DISPLAY);
-      QByteArray kdedisplay = getenv("KDE_DISPLAY");
+      QByteArray olddisplay = qgetenv(DISPLAY);
+      QByteArray kdedisplay = qgetenv("KDE_DISPLAY");
       bool reset_display = (! olddisplay.isEmpty() &&
                             ! kdedisplay.isEmpty() &&
                             olddisplay != kdedisplay);
@@ -1440,13 +1440,13 @@
 static void kdeinit_library_path()
 {
    QStringList ltdl_library_path =
-     QFile::decodeName(getenv("LTDL_LIBRARY_PATH")).split(':',QString::SkipEmptyParts);
 +     QFile::decodeName(qgetenv("LTDL_LIBRARY_PATH")).split(':',QString::SkipEmptyParts);
  #ifdef Q_OS_DARWIN
    QStringList ld_library_path =
-     QFile::decodeName(getenv("DYLD_LIBRARY_PATH")).split(':',QString::SkipEmptyParts);
 +     QFile::decodeName(qgetenv("DYLD_LIBRARY_PATH")).split(':',QString::SkipEmptyParts);
  #else
    QStringList ld_library_path =
-     QFile::decodeName(getenv("LD_LIBRARY_PATH")).split(':',QString::SkipEmptyParts);
 +     QFile::decodeName(qgetenv("LD_LIBRARY_PATH")).split(':',QString::SkipEmptyParts);
  #endif
 
    QByteArray extra_path;
@@ -1484,7 +1484,7 @@
 //   if (!extra_path.isEmpty())
 //      lt_dlsetsearchpath(extra_path.data());
 
-   QByteArray display = getenv(DISPLAY);
+   QByteArray display = qgetenv(DISPLAY);
    if (display.isEmpty())
    {
 #if defined(Q_WS_X11) || defined(Q_WS_QWS)
@@ -1784,7 +1784,7 @@
       init_kdeinit_socket();
    }
 #ifdef Q_WS_X11
-   if (!d.suicide && !getenv("KDE_IS_PRELINKED"))
+   if (!d.suicide && qgetenv("KDE_IS_PRELINKED").isEmpty())
    {
        QString konq = KStandardDirs::locate("lib", "libkonq.so.5", *s_instance);
        // can't use KLibLoader here as it would unload the library
--- trunk/KDE/kdelibs/kinit/kioslave.cpp #803530:803531
@@ -112,7 +112,7 @@
 
 #ifdef Q_WS_WIN
      // enter debugger in case debugging is actived 
-     if (QString::fromLatin1( getenv("KDE_SLAVE_DEBUG_WAIT") ) == argv[2]) 
+     if (QString::fromLocal8Bit( qgetenv("KDE_SLAVE_DEBUG_WAIT") ) == argv[2])
      {
 # ifdef Q_CC_MSVC
         // msvc debugger or windbg supports jit debugging, the latter requires \
setting up windbg jit with windbg -i @@ -129,7 +129,7 @@
 # endif
      } 
 # ifdef Q_CC_MSVC
-     else if (QString::fromLatin1( getenv("KDE_SLAVE_DEBUG_POPUP") ) == argv[2]) {
+     else if (QString::fromLocal8Bit( qgetenv("KDE_SLAVE_DEBUG_POPUP") ) == argv[2]) \
                {
         // A workaround for OSes where DebugBreak() does not work in administrative \
                mode (actually Vista with msvc 2k5)
         // - display a native message box so developer can attach the debugger to \
the KIO slave process and click OK.  MessageBoxA(NULL, 
--- trunk/KDE/kdelibs/kinit/klauncher.cpp #803530:803531
@@ -196,15 +196,15 @@
    lastRequest = 0;
    bProcessingQueue = false;
 
-   mSlaveDebug = getenv("KDE_SLAVE_DEBUG_WAIT");
+   mSlaveDebug = QString::fromLocal8Bit(qgetenv("KDE_SLAVE_DEBUG_WAIT"));
    if (!mSlaveDebug.isEmpty())
    {
       qWarning("Klauncher running in slave-debug mode for slaves of protocol '%s'", \
qPrintable(mSlaveDebug));  }
-   mSlaveValgrind = getenv("KDE_SLAVE_VALGRIND");
+   mSlaveValgrind = QString::fromLocal8Bit(qgetenv("KDE_SLAVE_VALGRIND"));
    if (!mSlaveValgrind.isEmpty())
    {
-      mSlaveValgrindSkin = getenv("KDE_SLAVE_VALGRIND_SKIN");
+      mSlaveValgrindSkin = \
                QString::fromLocal8Bit(qgetenv("KDE_SLAVE_VALGRIND_SKIN"));
       qWarning("Klauncher running slaves through valgrind for slaves of protocol \
'%s'", qPrintable(mSlaveValgrind));  }
 #ifdef Q_WS_WIN


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