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

List:       kde-commits
Subject:    KDE/kdelibs/kdecore/kernel
From:       Kevin Ottens <ervin () kde ! org>
Date:       2010-11-03 16:54:01
Message-ID: 20101103165401.5C1E5AC89E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1192648 by ervin:

Remove deprecated symbol from the build (if KDE_NO_DEPRECATED is defined).

 M  +4 -0      ktoolinvocation.cpp  
 M  +4 -0      ktoolinvocation.h  


--- trunk/KDE/kdelibs/kdecore/kernel/ktoolinvocation.cpp #1192647:1192648
@@ -139,6 +139,7 @@
     return reply.arguments().at(0).toInt();
 }
 
+#ifndef KDE_NO_DEPRECATED
 int
 KToolInvocation::startServiceByName( const QString& _name, const QString &URL,
                                      QString *error, QString *serviceName, int *pid,
@@ -153,7 +154,9 @@
     return self()->startServiceInternal("start_service_by_name",
                                         _name, URLs, error, serviceName, pid, \
startup_id, noWait);  }
+#endif
 
+#ifndef KDE_NO_DEPRECATED
 int
 KToolInvocation::startServiceByName( const QString& _name, const QStringList &URLs,
                                      QString *error, QString *serviceName, int *pid,
@@ -165,6 +168,7 @@
     return self()->startServiceInternal("start_service_by_name",
                                 _name, URLs, error, serviceName, pid, startup_id, \
noWait);  }
+#endif
 
 int
 KToolInvocation::startServiceByDesktopPath( const QString& _name, const QString \
                &URL,
--- trunk/KDE/kdelibs/kdecore/kernel/ktoolinvocation.h #1192647:1192648
@@ -203,9 +203,11 @@
    * @return an error code indicating success (== 0) or failure (> 0).
    * @deprecated Use startServiceByDesktopName or startServiceByDesktopPath
    */
+#ifndef KDE_NO_DEPRECATED
   KDE_DEPRECATED static int startServiceByName( const QString& _name, const QString \
                &URL,
                                                 QString *error=0, QString \
                *serviceName=0, int *pid=0,
                                                 const QByteArray &startup_id = \
QByteArray(), bool noWait = false ); +#endif
 
   /**
    * Starts a service based on the (translated) name of the service.
@@ -228,9 +230,11 @@
    * @return an error code indicating success (== 0) or failure (> 0).
    * @deprecated Use startServiceByDesktopName or startServiceByDesktopPath
    */
+#ifndef KDE_NO_DEPRECATED
   KDE_DEPRECATED static int startServiceByName( const QString& _name, const \
                QStringList &URLs=QStringList(),
                                                 QString *error=0, QString \
                *serviceName=0, int *pid=0,
                                                 const QByteArray &startup_id = \
QByteArray(), bool noWait = false ); +#endif
 
   /**
    * Starts a service based on the desktop path of the service.


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