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

List:       kde-commits
Subject:    KDE/kdelibs
From:       Michel Hermier <michel.hermier () wanadoo ! fr>
Date:       2005-10-26 15:34:32
Message-ID: 1130340872.203607.26638.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 474500 by hermier:

Revert commits from 474455 to 474462, resurection of KShared.

 M  +2 -2      kabc/scripts/addressee.src.cpp  
 M  +1 -1      kio/kio/krun.cpp  
 M  +1 -1      kio/kio/ktraderparsetree.h  
 M  +1 -1      kresources/configpage.h  
 M  +2 -2      kspell2/broker.h  


--- trunk/KDE/kdelibs/kabc/scripts/addressee.src.cpp #474499:474500
@@ -46,7 +46,7 @@
 
 KABC::SortMode *Addressee::mSortMode = 0;
 
-struct Addressee::AddresseeData
+struct Addressee::AddresseeData : public KShared
 {
   QString uid;
   --VARIABLES--
@@ -97,7 +97,7 @@
 
 void Addressee::detach()
 {
-  if ( mData.get() == shared_null ) {
+  if ( mData.data() == shared_null ) {
     mData = new AddresseeData;
     mData->empty = true;
     mData->changed = false;
--- trunk/KDE/kdelibs/kio/kio/krun.cpp #474499:474500
@@ -749,7 +749,7 @@
   proc->setUseShell(true);
   *proc << cmd;
   KService::Ptr service = KService::serviceByDesktopName( binaryName( execName, true ) );
-  return runCommandInternal( proc, service.get(), binaryName( execName, false ), execName, iconName );
+  return runCommandInternal( proc, service.data(), binaryName( execName, false ), execName, iconName );
 }
 
 KRun::KRun( const KURL& url, QWidget* window, mode_t mode, bool isLocalFile,
--- trunk/KDE/kdelibs/kio/kio/ktraderparsetree.h #474499:474500
@@ -120,7 +120,7 @@
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeBase
+class KIO_EXPORT ParseTreeBase : public KShared
 {
 public:
   typedef KSharedPtr<ParseTreeBase> Ptr;
--- trunk/KDE/kdelibs/kresources/configpage.h #474499:474500
@@ -38,7 +38,7 @@
 
 namespace KRES {
 
-class KRESOURCES_EXPORT ResourcePageInfo
+class KRESOURCES_EXPORT ResourcePageInfo : public KShared
 {
   public:
     ResourcePageInfo();
--- trunk/KDE/kdelibs/kspell2/broker.h #474499:474500
@@ -23,7 +23,6 @@
 #define KSPELL_BROKER_H
 
 #include <ksharedptr.h>
-#include <kdelibs_export.h>
 
 #include <qobject.h>
 #include <qstringlist.h>
@@ -46,7 +45,8 @@
      * KSpell2 class, you can think of it as the kernel or manager
      * of the KSpell2 architecture.
      */
-    class KDE_EXPORT Broker : public QObject
+    class KDE_EXPORT Broker : public QObject,
+                   public KShared
     {
         Q_OBJECT
     public:
[prev in list] [next in list] [prev in thread] [next in thread]