diff options
Diffstat (limited to 'kopete/kopete/contactlist')
| -rw-r--r-- | kopete/kopete/contactlist/kopetecontactlistview.cpp | 8 | ||||
| -rw-r--r-- | kopete/kopete/contactlist/kopetegroupviewitem.cpp | 6 | ||||
| -rw-r--r-- | kopete/kopete/contactlist/kopetemetacontactlvi.cpp | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp index 7b060d3d..112be721 100644 --- a/kopete/kopete/contactlist/kopetecontactlistview.cpp +++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp @@ -79,7 +79,11 @@ class ContactListViewStrategy; class KopeteContactListViewPrivate { public: - std::auto_ptr<ContactListViewStrategy> viewStrategy; + KopeteContactListViewPrivate() {} + KopeteContactListViewPrivate(KopeteContactListViewPrivate const &) = delete; + KopeteContactListViewPrivate& operator=(KopeteContactListViewPrivate const &) = delete; + + std::unique_ptr<ContactListViewStrategy> viewStrategy; void updateViewStrategy( TDEListView *view ); }; @@ -365,7 +369,7 @@ void KopeteContactListViewPrivate::updateViewStrategy( TDEListView *view ) if ( !viewStrategy.get() || KopetePrefs::prefs()->sortByGroup() != bSortByGroup ) { // delete old strategy first... - viewStrategy.reset( 0 ); + viewStrategy.reset(); // then create and store a new one if ( KopetePrefs::prefs()->sortByGroup() ) viewStrategy.reset( new ArrangeByGroupsViewStrategy(view) ); diff --git a/kopete/kopete/contactlist/kopetegroupviewitem.cpp b/kopete/kopete/contactlist/kopetegroupviewitem.cpp index 55f4165f..c08dfa01 100644 --- a/kopete/kopete/contactlist/kopetegroupviewitem.cpp +++ b/kopete/kopete/contactlist/kopetegroupviewitem.cpp @@ -38,11 +38,15 @@ class KopeteGroupViewItem::Private { public: + Private() {} + Private(Private const &) = delete; + Private& operator=(Private const &) = delete; + Kopete::UI::ListView::GroupBoxComponent *hbox; Kopete::UI::ListView::ImageComponent *image; Kopete::UI::ListView::TextComponent *name; Kopete::UI::ListView::TextComponent *count; - std::auto_ptr<Kopete::UI::ListView::ToolTipSource> toolTipSource; + std::unique_ptr<Kopete::UI::ListView::ToolTipSource> toolTipSource; }; namespace Kopete { diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp index a4f162d2..d088e971 100644 --- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp +++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp @@ -150,13 +150,15 @@ class KopeteMetaContactLVI::Private public: Private() : metaContactIcon( 0L ), nameText( 0L ), extraText( 0L ), contactIconBox( 0L ), currentMode( -1 ), currentIconMode( -1 ), hbox(NULL) {} + Private(Private const &) = delete; + Private& operator=(Private const &) = delete; ListView::ContactBoxComponent *hbox; ListView::FaceComponent *metaContactIcon; ListView::DisplayNameComponent *nameText; ListView::DisplayNameComponent *extraText; ListView::BoxComponent *contactIconBox; ListView::BoxComponent *spacerBox; - std::auto_ptr<ListView::ToolTipSource> toolTipSource; + std::unique_ptr<ListView::ToolTipSource> toolTipSource; // metacontact icon size int iconSize; // protocol icon size |