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

List:       kde-commits
Subject:    kdeextragear-2/konversation/konversation/linkaddressbook
From:       John Tapsell <john () geola ! co ! uk>
Date:       2004-08-29 17:52:33
Message-ID: 20040829175233.220C41DD4 () office ! kde ! org
[Download RAW message or body]

CVS commit by johnflux: 

Make destructors virtual.. I still don't really understand virtual
destructors and stuff *sigh*.


  M +2 -0      addressbook.cpp   1.22
  M +6 -3      addressbook.h   1.20
  M +3 -0      addressbook_base.cpp   1.2
  M +2 -1      addressbook_base.h   1.2


--- kdeextragear-2/konversation/konversation/linkaddressbook/addressbook.cpp  \
#1.21:1.22 @@ -31,4 +31,6 @@ Addressbook::Addressbook() : DCOPObject(
         m_ticket=NULL;
 }
+Addressbook::~Addressbook() {
+}
 
 Addressbook *Addressbook::self() {

--- kdeextragear-2/konversation/konversation/linkaddressbook/addressbook.h  \
#1.19:1.20 @@ -34,4 +34,6 @@ class Addressbook : public AddressbookBa
   Q_OBJECT
   public:
+    
+    virtual ~Addressbook(); // This needs to be public so it can be deleted by our \
static pointer  static Addressbook *self();
     QStringList allContactsNicks();         
@@ -84,8 +86,9 @@ class Addressbook : public AddressbookBa
 
     bool addContact( const QString &contactId, const QString &protocolId );
+
   protected:
+    Addressbook();
     
     static Addressbook *m_instance;
-    Addressbook();
 };
 

--- kdeextragear-2/konversation/konversation/linkaddressbook/addressbook_base.cpp  \
#1.1:1.2 @@ -30,4 +30,7 @@ AddressbookBase::AddressbookBase()
 }
 
+AddressbookBase::~AddressbookBase() {
+}
+
 KABC::AddressBook *AddressbookBase::getAddressBook() { return addressBook; }
 

--- kdeextragear-2/konversation/konversation/linkaddressbook/addressbook_base.h  \
#1.1:1.2 @@ -32,4 +32,6 @@ class AddressbookBase : public QObject, 
   Q_OBJECT
   public:
+
+    virtual ~AddressbookBase(); // This needs to be public so it can be deleted by \
                our static pointer
     KABC::Addressee getKABCAddresseeFromNick(const QString &ircnick, const QString \
&servername, const QString &servergroup);  KABC::Addressee \
getKABCAddresseeFromNick(const QString &nick_server);


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