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

[Oliver Kellogg]

SVN commit 563598 by okellogg:

move directory classparser to codeimport/

 M  +4 -5      Makefile.am  
 D             classparser (directory)  
 M  +3 -1      codeimport/Makefile.am  
 A             codeimport/classparser (directory)   classparser#563591
 M  +1 -1      codeimport/classparser/Makefile.am  
 M  +4 -4      codeimport/classparser/cpptree2uml.cpp  
 M  +3 -4      codeimport/classparser/cpptree2uml.h  
 M  +3 -3      codeimport/cppimport.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/Makefile.am #563597:563598
@@ -112,13 +112,12 @@
 widget_utils.cpp \
 worktoolbar.cpp
 
-#umbrello_LDADD   = ./refactoring/librefactoring.la ./classparser/libclassparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(AUTOLAYOUT_LIBS) $(LIB_KDEPRINT) $(LIB_KIO)
-umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./classparser/libclassparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(LIB_KDEPRINT) $(LIB_KIO)
+#umbrello_LDADD   = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/classparser/libclassparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(AUTOLAYOUT_LIBS) $(LIB_KDEPRINT) $(LIB_KIO)
+umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/classparser/libclassparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(LIB_KDEPRINT) $(LIB_KIO)
 
 ## See section "dnl Not GPL compatible" in ../configure.in.in
-# SUBDIRS = $(AUTOLAYOUT_DIR) classparser dialogs clipboard pics codegenerators headings refactoring
-SUBDIRS = codeimport classparser dialogs clipboard pics codegenerators headings \
-	refactoring
+# SUBDIRS = $(AUTOLAYOUT_DIR) codeimport dialogs clipboard pics codegenerators headings refactoring
+SUBDIRS = codeimport dialogs clipboard pics codegenerators headings refactoring
 
 KDE_ICON=AUTO
 
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codeimport/Makefile.am #563597:563598
@@ -1,4 +1,6 @@
-INCLUDES = -I../classparser $(all_includes)
+INCLUDES = -I./classparser $(all_includes)
 
 noinst_LTLIBRARIES = libcodeimport.la
 libcodeimport_la_SOURCES = adaimport.cpp classimport.cpp cppimport.cpp idlimport.cpp import_utils.cpp javaimport.cpp nativeimportbase.cpp pascalimport.cpp pythonimport.cpp
+
+SUBDIRS = classparser
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codeimport/classparser/Makefile.am #563591:563598
@@ -1,4 +1,4 @@
-INCLUDES = -I../dialogs $(all_includes)
+INCLUDES = $(all_includes)
 
 noinst_LTLIBRARIES = libclassparser.la
 libclassparser_la_SOURCES = ast.cpp driver.cpp errors.cpp lexer.cpp lookup.cpp parser.cpp tree_parser.cpp urlutil.cpp ast_utils.cpp cpptree2uml.cpp
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codeimport/classparser/cpptree2uml.cpp #563591:563598
@@ -20,13 +20,13 @@
 // app includes
 #include "ast_utils.h"
 #include "urlutil.h"
-#include "../codeimport/import_utils.h"
+#include "../import_utils.h"
 // FIXME: The sole reason for the next 2 includes is parseTypedef().
 // Make capsule methods in ClassImport, and remove these includes.
-#include "../classifier.h"
-#include "../datatype.h"
+#include "../../classifier.h"
+#include "../../datatype.h"
 // FIXME The next include is motivated by template params
-#include "../template.h"
+#include "../../template.h"
 
 CppTree2Uml::CppTree2Uml( const QString& fileName)
     : m_anon( 0 ), m_nsCnt( 0 ), m_clsCnt( 0 )
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codeimport/classparser/cpptree2uml.h #563591:563598
@@ -1,13 +1,12 @@
 /***************************************************************************
- *   cpptree2uml.h - based on kdevelop/languages/cpp/store_walker.h,       *
- *                   Copyright (C) 2003 by Roberto Raggi                   *
- *   Copyright (C) 2004 by Oliver Kellogg <okellogg at users.sourceforge.net> *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
+ *   copyright (C) 2005-2006                                               *
+ *   Umbrello UML Modeller Authors <uml-devel@ uml.sf.net>                 *
  ***************************************************************************/
 
 #ifndef CPPTREE2UML_H
@@ -15,7 +14,7 @@
 
 #include "tree_parser.h"
 #include <qstringlist.h>
-#include "../model_utils.h"
+#include "../../model_utils.h"
 
 // fwd decls
 class UMLClassifier;
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codeimport/cppimport.cpp #563597:563598
@@ -29,9 +29,9 @@
 #include "../attribute.h"
 #include "../template.h"
 #include "../association.h"
-#include "../classparser/lexer.h"
-#include "../classparser/driver.h"
-#include "../classparser/cpptree2uml.h"
+#include "./classparser/lexer.h"
+#include "./classparser/driver.h"
+#include "./classparser/cpptree2uml.h"
 
 // static members
 CppDriver * CppImport::ms_driver;