[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Christian Ehrlicher]

SVN commit 679223 by chehrlic:

win32/msvc compile++

 M  +1 -22     CMakeLists.txt  
 M  +1 -1      dialogs/umlforeignkeyconstraintdialog.cpp  
 M  +1 -1      foreignkeyconstraint.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/CMakeLists.txt #679222:679223
@@ -109,13 +109,6 @@
 
 kde4_automoc(${libcodegenerator_SRCS})
 
-if (WIN32)
-  kde4_add_library(codegenerators STATIC ${libcodegenerator_SRCS})
-  target_link_libraries(codegenerators)
-  set (LIBS ${LIBS} codegenerators)
-  set(libcodegenerator_SRCS)
-endif (WIN32)
-
 set(libdocgenerator_SRCS
     docgenerators/docbookgenerator.cpp 
     docgenerators/xhtmlgenerator.cpp)
@@ -181,13 +174,6 @@
 
 kde4_automoc(${libdialogs_SRCS})
 
-if (WIN32)
-  kde4_add_library(dialogs STATIC ${libdialogs_SRCS})
-  target_link_libraries(dialogs )
-  set (LIBS ${LIBS} dialogs )
-  set(libdialogs_SRCS)
-endif (WIN32)
-
 set(librefactoring_SRCS 
 		refactoring/refactoringassistant.cpp )
 
@@ -220,13 +206,6 @@
 
 kde4_automoc(${libkdevcppparser_SRCS})
 
-if (WIN32)
-  kde4_add_library(kdevcppparser STATIC ${libkdevcppparser_SRCS})
-  target_link_libraries(kdevcppparser)
-  set (LIBS ${LIBS} kdevcppparser )
-  set(kdevcppparser_SRCS)
-endif (WIN32)
-
 set(libclipboard_SRCS 
 	clipboard/umldrag.cpp 
 	clipboard/umlclipboard.cpp 
@@ -409,7 +388,7 @@
 )
 
 kde4_add_executable(umbrello ${umbrello_SRCS})
-target_link_libraries(umbrello ${KDE4_KIO_LIBS} ${KDE4_KDEPRINT_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBUUID} ${LIBS})
+target_link_libraries(umbrello ${KDE4_KIO_LIBS} ${KDE4_KDEPRINT_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBUUID})
 install(TARGETS umbrello DESTINATION ${BIN_INSTALL_DIR} )
 
 ########### install files ###############
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umlforeignkeyconstraintdialog.cpp #679222:679223
@@ -71,7 +71,7 @@
     int indexL = m_ColumnWidgets.localColumnCB->currentIndex();
     int indexR = m_ColumnWidgets.referencedColumnCB->currentIndex();
 
-    if ( indexL==-1 or indexR==-1 )
+    if ( indexL==-1 || indexR==-1 )
         return;
 
     // local entity attribute
--- trunk/KDE/kdesdk/umbrello/umbrello/foreignkeyconstraint.cpp #679222:679223
@@ -118,7 +118,7 @@
 
     UMLEntity *owningParent = dynamic_cast<UMLEntity*>(parent());
 
-    if ( pAttr == NULL or rAttr == NULL ) {
+    if ( pAttr == NULL || rAttr == NULL ) {
         kError()<< k_funcinfo <<"null values passed to function"<<endl;
         return false;
     }