[Uml-devel] branches/work/soc-umbrello

[Gopala Krishna A]

SVN commit 851687 by gopala:

Merged revisions 835292,836136,836141,836597,836600 via svnmerge from 
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello

........
  r835292 | chehrlic | 2008-07-20 17:19:53 +0530 (Sun, 20 Jul 2008) | 1 line
  
  remove hack for mingw + cmake 2.4.x - nobody on windows is using cmake 2.4 anymore
........
  r836136 | fischer | 2008-07-22 01:01:38 +0530 (Tue, 22 Jul 2008) | 1 line
  
  Moving unused files configurable, plugin, and pluginloader to the directory _unused.
........
  r836141 | fischer | 2008-07-22 01:14:17 +0530 (Tue, 22 Jul 2008) | 1 line
  
  Krazy: skip directory _unused.
........
  r836597 | fischer | 2008-07-22 21:25:50 +0530 (Tue, 22 Jul 2008) | 1 line
  
  Fixing the skip command.
........
  r836600 | fischer | 2008-07-22 21:32:27 +0530 (Tue, 22 Jul 2008) | 1 line
  
  SVN_SILENT: delete and add it later to fix access mode.
........


 _M            . (directory)  
 M  +1 -1      .krazy  
 D             CODING-STYLE  
 M  +2 -35     umbrello/CMakeLists.txt  
 A             umbrello/_unused (directory)   trunk/KDE/kdesdk/umbrello/umbrello/_unused#836600
 D             umbrello/configurable.cpp  
 D             umbrello/configurable.h  
 D             umbrello/plugin.cpp  
 D             umbrello/plugin.h  
 D             umbrello/pluginloader.cpp  
 D             umbrello/pluginloader.h  
 M  +0 -1      umbrello/uml.cpp  
 M  +1 -1      umbrello/umllistview.cpp  


** branches/work/soc-umbrello #property svnmerge-integrated
   - /trunk/KDE/kdesdk/umbrello:1-814855,815154,815433,815906,815954,816854,816861,817524,817552,819993,820008,821827,823169,823983,824915,825421,828311,828369,828633,828663,828672,829236,829488,829667,829787,829794,829805,831217,831259-831329,831762-831889,832286,832401-834375
   + /trunk/KDE/kdesdk/umbrello:1-814855,815154,815433,815906,815954,816854,816861,817524,817552,819993,820008,821827,823169,823983,824915,825421,828311,828369,828633,828663,828672,829236,829488,829667,829787,829794,829805,831217,831259-831329,831762-831889,832286,832401-834375,835292-836600
--- branches/work/soc-umbrello/.krazy #851686:851687
@@ -1 +1 @@
-SKIP /umbrello/headings/
+SKIP /umbrello/headings/\|/umbrello/_unused/
--- branches/work/soc-umbrello/umbrello/CMakeLists.txt #851686:851687
@@ -297,7 +297,6 @@
    combinedfragmentwidget.cpp
    component.cpp
    componentwidget.cpp
-   configurable.cpp
    datatypewidget.cpp
    dialog_utils.cpp
    docwindow.cpp
@@ -345,8 +344,6 @@
    petalnode.cpp
    petaltree2uml.cpp
    pinwidget.cpp
-   plugin.cpp
-   pluginloader.cpp
    preconditionwidget.cpp
    seqlinewidget.cpp
    statewidget.cpp
@@ -396,38 +393,8 @@
    worktoolbar.cpp
 )
 
-if (WIN32)
-    # workaround for win32 command line to long problem
-    # build intermediate libraries
+kde4_add_kcfg_files(umbrello_SRCS umbrellosettings.kcfgc)
 
-    kde4_add_library(dialogs  	${libdialogs_SRCS})
-    target_link_libraries (dialogs)
-    set (libdialogs_SRCS)
-
-    kde4_add_library(codeimport ${libcodeimport_SRCS})
-    target_link_libraries (codeimport)
-    set (libcodeimport_SRCS)
-
-    kde4_add_kcfg_files(libcodegenerator_SRCS umbrellosettings.kcfgc)
-    kde4_add_library(generators ${libcodegenerator_SRCS})
-    target_link_libraries (generators )
-    set (libcodegenerator_SRCS)
-
-    kde4_add_library(docgenerator ${libdocgenerator_SRCS})
-    target_link_libraries (docgenerator)
-    set (libdocgenerator_SRCS)
-
-    kde4_add_library(cmds ${libcmds_SRCS})
-    target_link_libraries (cmds)
-    set (libcmds_SRCS)
-
-    set (LIBS codeimport dialogs generators docgenerator cmds)
-
-else (WIN32)
-    set (LIBS )
-    kde4_add_kcfg_files(umbrello_SRCS umbrellosettings.kcfgc)
-endif (WIN32)
-
 set (umbrello_SRCS
 	${umbrello_SRCS}
 	${libdialogs_SRCS}
@@ -445,7 +412,7 @@
 
 kde4_add_app_icon(umbrello_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app-umbrello.png")
 kde4_add_executable(umbrello ${umbrello_SRCS})
-target_link_libraries(umbrello  ${LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBUUID} )
+target_link_libraries(umbrello  ${KDE4_KFILE_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBUUID} )
 install(TARGETS umbrello ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 ########### install files ###############
--- branches/work/soc-umbrello/umbrello/uml.cpp #851686:851687
@@ -62,7 +62,6 @@
 #include "kplayerslideraction.h"
 #include "docwindow.h"
 #include "optionstate.h"
-#include "configurable.h"
 #include "cmdlineexportallviewsevent.h"
 #include "cmds.h"
 #include "umbrellosettings.h"
--- branches/work/soc-umbrello/umbrello/umllistview.cpp #851686:851687
@@ -149,7 +149,7 @@
 
 bool UMLListView::eventFilter(QObject *o, QEvent *e)
 {
-    if (e->type() != QEvent::MouseButtonPress || !o->isA("QHeader"))
+    if (e->type() != QEvent::MouseButtonPress || qstrcmp("QHeader", metaObject()->className()) != 0)
         return Q3ListView::eventFilter(o, e);
     QMouseEvent *me = static_cast<QMouseEvent*>(e);
     if (me->button() == Qt::RightButton) {