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

List:       kde-commits
Subject:    KDE/kdevplatform
From:       Andreas Pakulat <apaku () gmx ! de>
Date:       2009-11-25 20:34:56
Message-ID: 1259181296.319492.502.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1054291 by apaku:

Disable the sourceformatter as its not possible to fix this up without
major time investment.

I've looked a bit at the code today and all I can say is wow,
this is broken. It stores pointers to plugins, doesn't update them as needed
assumes everywhere that things will be alright (i.e. no empty-checks, no
null-pointer-checks). This is not possible to fix easily without changing
major parts of the code. At this point in the release such a major
restructuring is not going to happen, additionally this codebase is basically
unmaintained ever since it was imported into svn.

So we'll have to live without it for 4.0

 M  +4 -4      interfaces/CMakeLists.txt  
 M  +2 -2      interfaces/icore.h  
 M  +7 -7      language/codegen/documentchangeset.cpp  
 M  +1 -1      plugins/CMakeLists.txt  
 M  +2 -2      shell/CMakeLists.txt  
 M  +8 -8      shell/core.cpp  
 M  +2 -2      shell/core.h  


--- trunk/KDE/kdevplatform/interfaces/CMakeLists.txt #1054290:1054291
@@ -18,8 +18,8 @@
     istatus.cpp
     iruncontroller.cpp
     isession.cpp
-    isourceformatter.cpp
-    isourceformattercontroller.cpp
+    #isourceformatter.cpp
+    #isourceformattercontroller.cpp
     contextmenuextension.cpp
     icompletionsettings.cpp
     iselectioncontroller.cpp
@@ -67,8 +67,8 @@
     ilanguage.h
     idocument.h
     idocumentcontroller.h
-    isourceformatter.h
-    isourceformattercontroller.h
+    #isourceformatter.h
+    #isourceformattercontroller.h
     iextension.h
     interfacesexport.h
     istatus.h
--- trunk/KDE/kdevplatform/interfaces/icore.h #1054290:1054291
@@ -45,7 +45,7 @@
 class IDocumentController;
 class ISessionController;
 class IRunController;
-class ISourceFormatterController;
+//class ISourceFormatterController;
 class ISession;
 class ISelectionController;
 class IDocumentationController;
@@ -104,7 +104,7 @@
     Q_SCRIPTABLE virtual KDevelop::ISession *activeSession() = 0;
 
     /** @return the sourceformatter controller */
-    Q_SCRIPTABLE virtual KDevelop::ISourceFormatterController \
*sourceFormatterController() = 0; +    //Q_SCRIPTABLE virtual \
KDevelop::ISourceFormatterController *sourceFormatterController() = 0;  
     /** @return the selection controller */
     Q_SCRIPTABLE virtual KDevelop::ISelectionController* selectionController() = 0;
--- trunk/KDE/kdevplatform/language/codegen/documentchangeset.cpp #1054290:1054291
@@ -28,8 +28,8 @@
 #include <language/duchain/duchainlock.h>
 #include <language/duchain/duchainutils.h>
 #include <language/duchain/parsingenvironment.h>
-#include <interfaces/isourceformattercontroller.h>
-#include <interfaces/isourceformatter.h>
+// #include <interfaces/isourceformattercontroller.h>
+// #include <interfaces/isourceformatter.h>
 #include <interfaces/iproject.h>
 #include <KLocalizedString>
 #include <algorithm>
@@ -462,9 +462,9 @@
                                                                           QString & \
output)  {
 
-    ISourceFormatter* formatter = 0;
-    if(ICore::self())
-        formatter = \
ICore::self()->sourceFormatterController()->formatterForUrl(file.toUrl()); +//     \
ISourceFormatter* formatter = 0; +//     if(ICore::self())
+//         formatter = \
ICore::self()->sourceFormatterController()->formatterForUrl(file.toUrl());  
     //Create the actual new modified file
     QStringList textLines = repr->text().split('\n');
@@ -481,8 +481,8 @@
 
             QString rightContext = \
QStringList(textLines.mid(change.m_range.end.line)).join("\n").mid(change.m_range.end.column);
  
-            if(formatter && formatPolicy == DocumentChangeSet::AutoFormatChanges)
-                change.m_newText = formatter->formatSource(change.m_newText, \
KMimeType::findByUrl(file.toUrl()), leftContext, rightContext); +//             \
if(formatter && formatPolicy == DocumentChangeSet::AutoFormatChanges) +//             \
change.m_newText = formatter->formatSource(change.m_newText, \
KMimeType::findByUrl(file.toUrl()), leftContext, rightContext);  
             textLines[change.m_range.start.line].replace(change.m_range.start.column, \
change.m_range.end.column-change.m_range.start.column, change.m_newText);  }else{
--- trunk/KDE/kdevplatform/plugins/CMakeLists.txt #1054290:1054291
@@ -12,7 +12,7 @@
 macro_optional_add_subdirectory(cvs)
 add_subdirectory(problemreporter)
 add_subdirectory(execute)
-add_subdirectory(sourceformatter)
+#add_subdirectory(sourceformatter)
 add_subdirectory(documentswitcher)
 add_subdirectory(patchreview)
 add_subdirectory(openwith)
--- trunk/KDE/kdevplatform/shell/CMakeLists.txt #1054290:1054291
@@ -27,7 +27,7 @@
     session.cpp
     savedialog.cpp
     sessiondialog.cpp
-    sourceformattercontroller.cpp
+    #sourceformattercontroller.cpp
     completionsettings.cpp
     openprojectpage.cpp
     openprojectdialog.cpp
@@ -125,7 +125,7 @@
     languagecontroller.h
     session.h
     sessioncontroller.h
-    sourceformattercontroller.h
+    #formattercontroller.h
     language.h
     shellexport.h
     selectioncontroller.h
--- trunk/KDE/kdevplatform/shell/core.cpp #1054290:1054291
@@ -46,7 +46,7 @@
 #include "documentcontroller.h"
 #include "runcontroller.h"
 #include "documentationcontroller.h"
-#include "sourceformattercontroller.h"
+//#include "sourceformattercontroller.h"
 #include "progressmanager.h"
 #include "selectioncontroller.h"
 #include "debugcontroller.h"
@@ -132,10 +132,10 @@
         runController = new RunController(m_core);
     }
 
-    if( !sourceFormatterController )
+    /*if( !sourceFormatterController )
     {
         sourceFormatterController = new SourceFormatterController(m_core);
-    }
+    }*/
 
     if ( !progressController) 
     {
@@ -186,7 +186,7 @@
         uiController->defaultMainWindow()->show();
     }
     runController->initialize();
-    sourceFormatterController->initialize();
+    //sourceFormatterController->initialize();
     selectionController->initialize();
     documentationController->initialize();
     debugController->initialize();
@@ -202,7 +202,7 @@
     delete documentController;
     delete runController;
     delete sessionController;
-    delete sourceFormatterController;
+    //delete sourceFormatterController;
     delete documentationController;
     delete debugController;
     delete workingSetController;
@@ -261,7 +261,7 @@
         d->runController->cleanup();
 
         d->projectController->cleanup();
-        d->sourceFormatterController->cleanup();
+        //d->sourceFormatterController->cleanup();
         d->pluginController->cleanup();
         d->sessionController->cleanup();
     }
@@ -354,10 +354,10 @@
     return d->runController;
 }
 
-ISourceFormatterController* Core::sourceFormatterController()
+/*ISourceFormatterController* Core::sourceFormatterController()
 {
     return d->sourceFormatterController;
-}
+}*/
 
 ProgressManager *Core::progressController()
 {
--- trunk/KDE/kdevplatform/shell/core.h #1054290:1054291
@@ -35,7 +35,7 @@
 class RunController;
 class SessionController;
 class CorePrivate;
-class SourceFormatterController;
+//class SourceFormatterController;
 class ProgressManager;
 class SelectionController;
 class DocumentationController;
@@ -80,7 +80,7 @@
     virtual IRunController *runController();
 
     /** @copydoc ICore::sourceFormatterController() */
-    virtual ISourceFormatterController* sourceFormatterController();
+    //virtual ISourceFormatterController* sourceFormatterController();
 
     /** @copydoc ICore::selectionController() */
     virtual ISelectionController* selectionController();


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