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

List:       kde-commits
Subject:    [libringclient] src: autocompletion, bookmarks: Minor fixes
From:       Emmanuel Lepage Vallee <emmanuel.lepage () savoirfairelinux ! com>
Date:       2015-04-30 22:05:14
Message-ID: E1Ynwa2-0002XV-Js () scm ! kde ! org
[Download RAW message or body]

Git commit 0d7fbc1b591e71286f8fd642269b9ec708527281 by Emmanuel Lepage Vallee.
Committed on 30/04/2015 at 22:04.
Pushed by lepagevalleeemmanuel into branch 'master'.

autocompletion, bookmarks: Minor fixes

 * Add missing bookmarks calls
 * Remove some useless qDebug()
 * Add a new auto completion role

Refs #71995

M  +1    -0    src/call.cpp
M  +3    -1    src/categorizedbookmarkmodel.cpp
M  +2    -0    src/numbercompletionmodel.cpp
M  +1    -0    src/numbercompletionmodel.h
M  +0    -2    src/private/directrenderer.cpp

http://commits.kde.org/libringclient/0d7fbc1b591e71286f8fd642269b9ec708527281

diff --git a/src/call.cpp b/src/call.cpp
index ef2636e..dbf91bf 100644
--- a/src/call.cpp
+++ b/src/call.cpp
@@ -1464,6 +1464,7 @@ void CallPrivate::start()
       m_pDialNumber = nullptr;
    }
    setStartTimeStamp(curTime);
+   initTimer();
 }
 
 ///Toggle the timer
diff --git a/src/categorizedbookmarkmodel.cpp b/src/categorizedbookmarkmodel.cpp
index 39abc18..75ddb60 100644
--- a/src/categorizedbookmarkmodel.cpp
+++ b/src/categorizedbookmarkmodel.cpp
@@ -504,7 +504,7 @@ void CategorizedBookmarkModel::addBookmark(ContactMethod* number)
 
 void CategorizedBookmarkModel::removeBookmark(ContactMethod* number)
 {
-   Q_UNUSED(number)
+   collections()[0]->editor<ContactMethod>()->remove(number);
 }
 
 void CategorizedBookmarkModel::remove(const QModelIndex& idx)
@@ -517,6 +517,7 @@ void CategorizedBookmarkModel::remove(const QModelIndex& idx)
 //       emit layoutAboutToBeChanged();
 //       emit layoutChanged();
 //    }
+   collections()[0]->editor<ContactMethod>()->remove(getNumber(idx));
 }
 
 ContactMethod* CategorizedBookmarkModel::getNumber(const QModelIndex& idx)
@@ -607,6 +608,7 @@ bool CategorizedBookmarkModel::clearAllCollections() const
 void CategorizedBookmarkModel::collectionAddedCallback(CollectionInterface* backend)
 {
    Q_UNUSED(backend)
+   reloadCategories();
 }
 
 // QString CategorizedBookmarkModel::backendCategoryName() const
diff --git a/src/numbercompletionmodel.cpp b/src/numbercompletionmodel.cpp
index 7238a16..e0143c4 100644
--- a/src/numbercompletionmodel.cpp
+++ b/src/numbercompletionmodel.cpp
@@ -189,6 +189,8 @@ QVariant NumberCompletionModel::data(const QModelIndex& index, int role ) const
                   return QString();
             case NumberCompletionModel::Role::FORCE_ACCOUNT:
                return needAcc;
+            case NumberCompletionModel::Role::PEER_NAME:
+               return n->primaryName();
             case NumberCompletionModel::Role::ACCOUNT:
                if (needAcc)
                   return QVariant::fromValue(n->account());
diff --git a/src/numbercompletionmodel.h b/src/numbercompletionmodel.h
index 810e2d9..8c708e0 100644
--- a/src/numbercompletionmodel.h
+++ b/src/numbercompletionmodel.h
@@ -42,6 +42,7 @@ public:
       ALTERNATE_ACCOUNT= 100,
       FORCE_ACCOUNT    = 101,
       ACCOUNT          = 102,
+      PEER_NAME        = 103,
    };
 
    NumberCompletionModel();
diff --git a/src/private/directrenderer.cpp b/src/private/directrenderer.cpp
index 6fcb1bc..121db6f 100644
--- a/src/private/directrenderer.cpp
+++ b/src/private/directrenderer.cpp
@@ -63,13 +63,11 @@ Video::DirectRenderer::~DirectRenderer()
 
 void Video::DirectRenderer::startRendering()
 {
-   qWarning() << "STARTING RENDERING";
    Video::Renderer::d_ptr->m_isRendering = true;
    emit started();
 }
 void Video::DirectRenderer::stopRendering ()
 {
-   qWarning() << "STOPPING RENDERING";
    Video::Renderer::d_ptr->m_isRendering = false;
    emit stopped();
 }
[prev in list] [next in list] [prev in thread] [next in thread]