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

[Ralf Habacker]

SVN commit 1266937 by habacker:

give all importers access to the thread structure to be able to send messages to log

 M  +2 -2      adaimport.cpp  
 M  +1 -1      adaimport.h  
 M  +3 -3      classimport.cpp  
 M  +1 -1      idlimport.cpp  
 M  +2 -2      idlimport.h  
 M  +1 -1      pascalimport.cpp  
 M  +1 -1      pascalimport.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/adaimport.cpp #1266936:1266937
@@ -32,8 +32,8 @@
 /**
  * Constructor.
  */
-AdaImport::AdaImport()
-  : NativeImportBase("--")
+AdaImport::AdaImport(CodeImpThread* thread)
+  : NativeImportBase("--", thread)
 {
     initVars();
 }
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/adaimport.h #1266936:1266937
@@ -25,7 +25,7 @@
 class AdaImport : public NativeImportBase
 {
 public:
-    AdaImport();
+    AdaImport(CodeImpThread* thread = 0);
     virtual ~AdaImport();
 
 protected:
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/classimport.cpp #1266936:1266937
@@ -38,15 +38,15 @@
 {
     ClassImport *classImporter;
     if (fileName.endsWith(QLatin1String(".idl")))
-        classImporter = new IDLImport();
+        classImporter = new IDLImport(thread);
     else if (fileName.contains(QRegExp("\\.pyw?$")))
         classImporter = new PythonImport(thread);
     else if (fileName.endsWith(QLatin1String(".java")))
         classImporter = new JavaImport(thread);
     else if (fileName.contains(QRegExp("\\.ad[sba]$")))
-        classImporter = new AdaImport();
+        classImporter = new AdaImport(thread);
     else if (fileName.endsWith(QLatin1String(".pas")))
-        classImporter = new PascalImport();
+        classImporter = new PascalImport(thread);
 #ifndef DISABLE_CPP_IMPORT
     else
         classImporter = new CppImport(thread);  // the default.
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/idlimport.cpp #1266936:1266937
@@ -37,7 +37,7 @@
 QStringList IDLImport::m_preProcessorArguments;
 bool IDLImport::m_preProcessorChecked = false;
 
-IDLImport::IDLImport() : NativeImportBase("//")
+IDLImport::IDLImport(CodeImpThread* thread) : NativeImportBase("//", thread)
 {
     m_isOneway = m_isReadonly = m_isAttribute = false;
     setMultiLineComment("/*", "*/");
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/idlimport.h #1266936:1266937
@@ -20,7 +20,7 @@
  */
 class IDLImport : public NativeImportBase {
 public:
-    IDLImport();
+    IDLImport(CodeImpThread* thread = 0);
     virtual ~IDLImport();
 
     bool parseStmt();
@@ -33,7 +33,7 @@
 
 protected:
     QString joinTypename();
-    bool m_isOneway, m_isReadonly, m_isAttribute;
+    bool m_isOneway, m_isReadonly, m_isAttribute, m_isLocal;
     static QString m_preProcessor;
     static QStringList m_preProcessorArguments;
     static bool m_preProcessorChecked;
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/pascalimport.cpp #1266936:1266937
@@ -30,7 +30,7 @@
 /**
  * Constructor.
  */
-PascalImport::PascalImport() : NativeImportBase("//")
+PascalImport::PascalImport(CodeImpThread* thread) : NativeImportBase("//", thread)
 {
     setMultiLineComment("(*", "*)");
     setMultiLineAltComment("{", "}");
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/pascalimport.h #1266936:1266937
@@ -21,7 +21,7 @@
 class PascalImport : public NativeImportBase
 {
 public:
-    PascalImport();
+    PascalImport(CodeImpThread* thread = 0);
     virtual ~PascalImport();
 
 protected: