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

List:       kde-commits
Subject:    Re: KDE/kdebase/workspace/kcontrol/input
From:       Maks Orlovich <mo85 () cornell ! edu>
Date:       2005-09-14 14:12:04
Message-ID: 200509141012.05041.mo85 () cornell ! edu
[Download RAW message or body]

On Wednesday 14 September 2005 09:33 am, Laurent Montel wrote:
> SVN commit 460599 by mlaurent:
>
> QByteArray

This one is wrong, too, should be DCOPCString.

>
>
>  M  +6 -6      main.cpp
>
>
> --- trunk/KDE/kdebase/workspace/kcontrol/input/main.cpp #460598:460599
> @@ -55,15 +55,15 @@
>
>  #ifdef HAVE_XCURSOR
>      config->setGroup("Mouse");
> -    Q3CString theme = QFile::encodeName(config->readEntry("cursorTheme",
> QString())); -    Q3CString size = config->readEntry("cursorSize",
> QString()).local8Bit(); +    QByteArray theme =
> QFile::encodeName(config->readEntry("cursorTheme", QString())); +   
> QByteArray size = config->readEntry("cursorSize", QString()).local8Bit();
>
>      // Note: If you update this code, update kapplymousetheme as well.
>
>      // use a default value for theme only if it's not configured at all,
> not even in X resources if( theme.isEmpty()
> -        && Q3CString( XGetDefault( QX11Info::display(), "Xcursor", "theme"
> )).isEmpty() -        && Q3CString( XcursorGetTheme(
> QX11Info::display())).isEmpty()) +        && QByteArray( XGetDefault(
> QX11Info::display(), "Xcursor", "theme" )).isEmpty() +        &&
> QByteArray( XcursorGetTheme( QX11Info::display())).isEmpty()) {
>          theme = "default";
>      }
> @@ -84,9 +84,9 @@
>      // variables when launching applications.
>      DCOPRef klauncher("klauncher");
>      if( !theme.isEmpty())
> -        klauncher.send("setLaunchEnv", Q3CString("XCURSOR_THEME"), theme);
> +        klauncher.send("setLaunchEnv", QByteArray("XCURSOR_THEME"),
> theme); if( !size.isEmpty())
> -        klauncher.send("setLaunchEnv", Q3CString("XCURSOR_SIZE"), size);
> +        klauncher.send("setLaunchEnv", QByteArray("XCURSOR_SIZE"), size);
>  #endif
>
>      delete config;
[prev in list] [next in list] [prev in thread] [next in thread]