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

List:       kde-commits
Subject:    KDE/kdevelop
From:       Stephan Binner <binner () kde ! org>
Date:       2007-04-29 10:22:39
Message-ID: 1177842159.131495.28610.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 659046 by binner:

fix build


 M  +1 -0      CMakeLists.txt  
 M  +5 -5      plugins/teamwork/conversationmanager.cpp  
 M  +1 -1      plugins/teamwork/documentwrapper.cpp  
 M  +5 -5      plugins/teamwork/filecollaborationmanager.cpp  
 M  +1 -1      plugins/teamwork/filecollaborationmessages.cpp  
 M  +4 -4      plugins/teamwork/filecollaborationsession.cpp  
 M  +1 -1      plugins/teamwork/helpers.cpp  
 M  +1 -1      plugins/teamwork/lib/dynamictext/CMakeLists.txt  
 M  +1 -1      plugins/teamwork/lib/network/CMakeLists.txt  


--- trunk/KDE/kdevelop/CMakeLists.txt #659045:659046
@@ -3,6 +3,7 @@
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
 
 
+find_package(ZLIB REQUIRED)
 find_package(KDE4 REQUIRED)
 #find_package(BerkeleyDB)
 #find_package(TDB)
--- trunk/KDE/kdevelop/plugins/teamwork/conversationmanager.cpp #659045:659046
@@ -55,9 +55,9 @@
 Q_DECLARE_METATYPE( MessagePointer )
 Q_DECLARE_METATYPE( InDocumentMessagePointer )
 
-CROSSMAP_KEY_EXTRACTOR( OrderedDocumentMessage, int, 0, value.position );
-CROSSMAP_KEY_EXTRACTOR( OrderedDocumentMessage, InDocumentMessagePointer, 0, \
                value.message );
-CROSSMAP_KEY_EXTRACTOR( OrderedDocumentMessage, QString, 0, \
value.message.lock()->start().document() ); +CROSSMAP_KEY_EXTRACTOR( \
OrderedDocumentMessage, int, 0, value.position ) +CROSSMAP_KEY_EXTRACTOR( \
OrderedDocumentMessage, InDocumentMessagePointer, 0, value.message ) \
+CROSSMAP_KEY_EXTRACTOR( OrderedDocumentMessage, QString, 0, \
value.message.lock()->start().document() )  
 template <class ArchType>
 void InDocumentConversation::load( ArchType& arch, unsigned int version ) {
@@ -235,7 +235,7 @@
 
 void ConversationManager::log( QString str, LogLevel level ) {
   m_manager->log( str, level );
-};
+}
 
 ConversationManager* InDocumentConversation::manager() const {
   return ConversationManager::instance();
@@ -593,7 +593,7 @@
 
 void InDocumentConversation::log( QString str, LogLevel level ) const {
   const_cast<ConversationManager*>( manager() ) ->log( "InDocumentConversation: " + \
                str, level );
-};
+}
 
 
 void InDocumentConversation::horizontalScrollPositionChanged ( KTextEditor::View \
                */*view*/ ) {
--- trunk/KDE/kdevelop/plugins/teamwork/documentwrapper.cpp #659045:659046
@@ -293,7 +293,7 @@
 
 void DocumentWrapper::manageDynamicText() {
   new VectorTimestampEditor( logger(), this, false, m_text, true );
-};
+}
 
 void DocumentWrapper::stateChanged() {
   if ( m_block )
--- trunk/KDE/kdevelop/plugins/teamwork/filecollaborationmanager.cpp #659045:659046
@@ -41,11 +41,11 @@
 
 using namespace Teamwork;
 
-CROSSMAP_KEY_EXTRACTOR( FileCollaborationSessionPointer, QList<QString>, 0, \
                value->plainFileNames() );
-CROSSMAP_KEY_EXTRACTOR( FileCollaborationSessionPointer, \
                QList<KDevTeamworkUserPointer>, 0, value->users() );
-CROSSMAP_KEY_EXTRACTOR( FileCollaborationSessionPointer, SessionName, 0, \
                value->name() );
-CROSSMAP_KEY_EXTRACTOR( FileCollaborationSessionPointer, \
                FileCollaborationSessionPointer, 0, value );
-CROSSMAP_KEY_EXTRACTOR( FileCollaborationSessionPointer, CollabSessionId, 0, \
value->id() ); +CROSSMAP_KEY_EXTRACTOR( FileCollaborationSessionPointer, \
QList<QString>, 0, value->plainFileNames() ) +CROSSMAP_KEY_EXTRACTOR( \
FileCollaborationSessionPointer, QList<KDevTeamworkUserPointer>, 0, value->users() ) \
+CROSSMAP_KEY_EXTRACTOR( FileCollaborationSessionPointer, SessionName, 0, \
value->name() ) +CROSSMAP_KEY_EXTRACTOR( FileCollaborationSessionPointer, \
FileCollaborationSessionPointer, 0, value ) +CROSSMAP_KEY_EXTRACTOR( \
FileCollaborationSessionPointer, CollabSessionId, 0, value->id() )  
 /**How file-collaboration should work:
  * Host:
--- trunk/KDE/kdevelop/plugins/teamwork/filecollaborationmessages.cpp #659045:659046
@@ -181,7 +181,7 @@
     return ReplyResult( true, true );
   else
     return ReplyResult( handled );
-};
+}
 
 void FileCollaborationRequestData::dispatchSignal( const AcceptSignal& /*sig*/ ) {
   acceptCollaboration();
--- trunk/KDE/kdevelop/plugins/teamwork/filecollaborationsession.cpp #659045:659046
@@ -46,11 +46,11 @@
 
 using namespace KDevelop;
 
-CROSSMAP_KEY_EXTRACTOR( FileCollaborationPointer, FileCollaborationPointer, 0, value \
                );
-CROSSMAP_KEY_EXTRACTOR( FileCollaborationPointer, UserPointer, 0, value->user() );
+CROSSMAP_KEY_EXTRACTOR( FileCollaborationPointer, FileCollaborationPointer, 0, value \
) +CROSSMAP_KEY_EXTRACTOR( FileCollaborationPointer, UserPointer, 0, value->user() )
 
-CROSSMAP_KEY_EXTRACTOR( DocumentWrapperPointer, QString, 0, value->fileName() );
-CROSSMAP_KEY_EXTRACTOR( DocumentWrapperPointer, uint, 0, value->id() );
+CROSSMAP_KEY_EXTRACTOR( DocumentWrapperPointer, QString, 0, value->fileName() )
+CROSSMAP_KEY_EXTRACTOR( DocumentWrapperPointer, uint, 0, value->id() )
 
 FileCollaborationSession::FileCollaborationSession( QString name, CollabFileList \
                files, FileCollaborationManager* manager, uint primaryIndex, \
                CollabSessionId id ) :
     SafeLogger( manager->teamwork() ->logger(), "in FileCollaborationSession:" ),
--- trunk/KDE/kdevelop/plugins/teamwork/helpers.cpp #659045:659046
@@ -20,7 +20,7 @@
 Teamwork::UserPointer userFromSession( const Teamwork::SessionPointer& session ) {
   if( !session ) return 0;
   return session.unsafe() ->safeUser();
-};
+}
 
 
 // kate: space-indent on; indent-width 2; tab-width 2; replace-tabs on
--- trunk/KDE/kdevelop/plugins/teamwork/lib/dynamictext/CMakeLists.txt #659045:659046
@@ -31,7 +31,7 @@
 #install(TARGETS dynamictext DESTINATION ${LIB_INSTALL_DIR})
 
 ADD_EXECUTABLE( testexec main.cpp)
-TARGET_LINK_LIBRARIES( testexec dynamictext boost_thread dl )
+TARGET_LINK_LIBRARIES( testexec dynamictext boost_thread dl ${ZLIB_LIBRARIES} )
 
 #ADD_DEPENDENCIES( testexec, dynamictext )
 
--- trunk/KDE/kdevelop/plugins/teamwork/lib/network/CMakeLists.txt #659045:659046
@@ -45,7 +45,7 @@
 
 ADD_EXECUTABLE( kdevteamwork_server ${testfiles} )
 
-TARGET_LINK_LIBRARIES( kdevteamwork_server boost_thread dl network \
${COMMONCPP2_LIBRARIES} ) +TARGET_LINK_LIBRARIES( kdevteamwork_server boost_thread dl \
network ${COMMONCPP2_LIBRARIES} ${ZLIB_LIBRARIES} )  
 INSTALL(TARGETS kdevteamwork_server DESTINATION ${BIN_INSTALL_DIR})
 


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