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

List:       kde-commits
Subject:    playground/network/kcall
From:       George Kiagiadakis <gkiagiad () csd ! uoc ! gr>
Date:       2009-06-22 14:09:22
Message-ID: 1245679762.586811.18953.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 985252 by gkiagia:

Move the models in a separate library, as they will be needed for kcall_handler.

 M  +5 -6      CMakeLists.txt  
 M  +6 -3      contactlistcontroller.cpp  
 M  +1 -1      kcallapplication.cpp  
 A             libkcallprivate (directory)  
 A             libkcallprivate/CMakeLists.txt  
 A             libkcallprivate/accountitem.cpp   models/accountitem.cpp#984435 \
[License: GPL (v2+)]  A             libkcallprivate/accountitem.h   \
models/accountitem.h#984435 [License: GPL (v2+)]  A             \
libkcallprivate/contactitem.cpp   models/contactitem.cpp#984435 [License: GPL (v2+)]  \
A             libkcallprivate/contactitem.h   models/contactitem.h#984435 [License: \
GPL (v2+)]  A             libkcallprivate/contactsmodel.cpp   \
models/contactsmodel.cpp#984435 [License: GPL (v2+)]  A             \
libkcallprivate/contactsmodel.h   models/contactsmodel.h#984435 [License: GPL (v2+)]  \
A             libkcallprivate/kcallprivate_export.h   [License: UNKNOWN]  A           \
libkcallprivate/pendingcontacts.cpp   models/pendingcontacts.cpp#984435 [License: GPL \
(v2+)]  A             libkcallprivate/pendingcontacts.h   \
models/pendingcontacts.h#984435 [License: GPL (v2+)]  A             \
libkcallprivate/treemodel.cpp   models/treemodel.cpp#984435 [License: GPL (v2+)]  A   \
libkcallprivate/treemodel.h   models/treemodel.h#984435 [License: GPL (v2+)]  M  +1 \
-1      mainwindow.cpp    D             models/accountitem.cpp  
 D             models/accountitem.h  
 D             models/contactitem.cpp  
 D             models/contactitem.h  
 D             models/contactsmodel.cpp  
 D             models/contactsmodel.h  
 D             models/pendingcontacts.cpp  
 D             models/pendingcontacts.h  
 D             models/treemodel.cpp  
 D             models/treemodel.h  


--- trunk/playground/network/kcall/CMakeLists.txt #985251:985252
@@ -11,6 +11,7 @@
 add_definitions(${KDE4_DEFINITIONS})
 
 add_subdirectory(kcall_handler)
+add_subdirectory(libkcallprivate)
 
 set(kcall_SRCS
     main.cpp
@@ -20,16 +21,14 @@
     abstractclientapprover.cpp
     systrayicon.cpp
     knotifyapprover.cpp
-    models/treemodel.cpp
-    models/contactsmodel.cpp
-    models/pendingcontacts.cpp
-    models/accountitem.cpp
-    models/contactitem.cpp
 )
 
 kde4_add_ui_files(kcall_SRCS mainwindow.ui)
 kde4_add_executable(kcall ${kcall_SRCS})
-target_link_libraries(kcall ${KDE4_KDEUI_LIBS} ${TELEPATHY_QT4_LIBRARIES} \
${KNOTIFICATIONITEM_LIBRARIES}) +target_link_libraries(kcall ${KDE4_KDEUI_LIBS}
+                            ${TELEPATHY_QT4_LIBRARIES}
+                            ${KNOTIFICATIONITEM_LIBRARIES}
+                            kcallprivate)
 
 install(TARGETS kcall ${INSTALL_TARGETS_DEFAULT_ARGS})
 #install(FILES kcallui.rc DESTINATION ${DATA_INSTALL_DIR}/kcall)
--- trunk/playground/network/kcall/contactlistcontroller.cpp #985251:985252
@@ -15,9 +15,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "contactlistcontroller.h"
-#include "models/contactsmodel.h"
-#include "models/accountitem.h" //for Q_DECLARE_METATYPE
-#include "models/contactitem.h" //for Q_DECLARE_METATYPE
+#include "libkcallprivate/contactsmodel.h"
 #include <QtGui/QAbstractItemView>
 #include <KDebug>
 #include <KIcon>
@@ -25,7 +23,12 @@
 #include <KMenu>
 #include <KLocalizedString>
 #include <TelepathyQt4/ReferencedHandles>
+#include <TelepathyQt4/Account>
+#include <TelepathyQt4/Contact>
 
+Q_DECLARE_METATYPE(Tp::AccountPtr);
+Q_DECLARE_METATYPE(Tp::ContactPtr);
+
 struct ContactListController::Private
 {
     QAbstractItemView *view;
--- trunk/playground/network/kcall/kcallapplication.cpp #985251:985252
@@ -18,7 +18,7 @@
 #include "mainwindow.h"
 #include "systrayicon.h"
 #include "knotifyapprover.h"
-#include "models/contactsmodel.h"
+#include "libkcallprivate/contactsmodel.h"
 #include <KDebug>
 #include <TelepathyQt4/AccountManager>
 #include <TelepathyQt4/PendingReady>
--- trunk/playground/network/kcall/mainwindow.cpp #985251:985252
@@ -18,7 +18,7 @@
 #include "ui_mainwindow.h"
 #include "kcallapplication.h"
 #include "contactlistcontroller.h"
-#include "models/contactsmodel.h"
+#include "libkcallprivate/contactsmodel.h"
 #include <KStatusBar>
 #include <KAction>
 #include <KActionCollection>


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