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

List:       kde-commits
Subject:    branches/work/kdev-its-gonna-be-great
From:       Adam Treat <treat () kde ! org>
Date:       2006-07-29 14:45:17
Message-ID: 1154184317.379231.28450.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 567609 by treat:

Move ProjectController --> KDevProjectController

We're going to do this for all the files in lib where
it isn't already done.


 M  +12 -12    kdevelop.kdevelop  
 M  +1 -1      languages/cpp/cpplanguagesupport.cpp  
 M  +2 -2      lib/CMakeLists.txt  
 M  +1 -1      lib/kdevconfig.cpp  
 M  +4 -7      lib/kdevcore.cpp  
 M  +3 -3      lib/kdevcore.h  
 M  +1 -2      lib/kdevmainwindow.cpp  
 A             lib/kdevprojectcontroller.cpp   lib/projectcontroller.cpp#567607 [License: LGPL (v2+)]
 A             lib/kdevprojectcontroller.h   lib/projectcontroller.h#567607 [License: LGPL (v2+)]
 D             lib/projectcontroller.cpp  
 D             lib/projectcontroller.h  
 M  +2 -2      src/main.cpp  


--- branches/work/kdev-its-gonna-be-great/kdevelop.kdevelop #567608:567609
@@ -12,7 +12,7 @@
     </keywords>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
-    <description></description>
+    <description/>
     <ignoreparts>
       <part>kdevbookmarks</part>
       <part>kdevclassview</part>
@@ -33,7 +33,7 @@
       <part>kdevtools</part>
     </ignoreparts>
     <versioncontrol>kdevsubversion</versioncontrol>
-    <defaultencoding></defaultencoding>
+    <defaultencoding/>
   </general>
   <kdevfileview>
     <groups>
@@ -91,12 +91,12 @@
   </kdevdoctreeview>
   <kdevdebugger>
     <general>
-      <dbgshell></dbgshell>
-      <programargs></programargs>
-      <gdbpath></gdbpath>
-      <configGdbScript></configGdbScript>
-      <runShellScript></runShellScript>
-      <runGdbScript></runGdbScript>
+      <dbgshell/>
+      <programargs/>
+      <gdbpath/>
+      <configGdbScript/>
+      <runShellScript/>
+      <runGdbScript/>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>
       <floatingtoolbar>false</floatingtoolbar>
@@ -202,7 +202,7 @@
       <headerCompletionDelay>250</headerCompletionDelay>
     </codecompletion>
     <creategettersetter>
-      <prefixGet></prefixGet>
+      <prefixGet/>
       <prefixSet>set</prefixSet>
       <prefixVariable>m_,_</prefixVariable>
       <parameterName>theValue</parameterName>
@@ -233,7 +233,7 @@
       <directoryradio>custom</directoryradio>
       <customdirectory>/</customdirectory>
       <mainprogram>/home/kde/installs/4.0/bin/kdevelop</mainprogram>
-      <programargs></programargs>
+      <programargs/>
       <terminal>false</terminal>
       <autocompile>true</autocompile>
       <envvars>
@@ -257,8 +257,8 @@
       <prio>0</prio>
       <dontact>false</dontact>
       <makebin>make</makebin>
-      <defaulttarget></defaulttarget>
-      <makeoptions></makeoptions>
+      <defaulttarget/>
+      <makeoptions/>
       <selectedenvironment>default</selectedenvironment>
       <environments>
         <default/>
--- branches/work/kdev-its-gonna-be-great/languages/cpp/cpplanguagesupport.cpp #567608:567609
@@ -29,7 +29,7 @@
 #include <kdevproject.h>
 #include <kdevfilemanager.h>
 #include <kdevprojectmodel.h>
-#include <projectcontroller.h>
+#include <kdevprojectcontroller.h>
 #include <kdevdocumentcontroller.h>
 
 #include "backgroundparser.h"
--- branches/work/kdev-its-gonna-be-great/lib/CMakeLists.txt #567608:567609
@@ -44,7 +44,7 @@
     kdevconfigskeleton.cpp
     kdevenv.cpp
     kdevconfig.cpp
-    projectcontroller.cpp
+    kdevprojectcontroller.cpp
     partcontroller.cpp
     languagecontroller.cpp
     statusbar.cpp
@@ -102,7 +102,7 @@
     kdevenv.h
     kdevconfig.h
     kdevsharedptr.h
-    projectcontroller.h
+    kdevprojectcontroller.h
     partcontroller.h
     languagecontroller.h
     statusbar.h
--- branches/work/kdev-its-gonna-be-great/lib/kdevconfig.cpp #567608:567609
@@ -23,7 +23,7 @@
 #include <kinstance.h>
 
 #include "kdevcore.h"
-#include "projectcontroller.h"
+#include "kdevprojectcontroller.h"
 
 KDevConfig::KDevConfig( QObject *parent )
         : QObject( parent )
--- branches/work/kdev-its-gonna-be-great/lib/kdevcore.cpp #567608:567609
@@ -34,8 +34,7 @@
 
 #include "kdevenv.h"
 
-//FIXME Remove these when the rest of src/* is merged
-#include "projectcontroller.h"
+#include "kdevprojectcontroller.h"
 #include "kdevdocumentcontroller.h"
 #include "kdevcontext.h"
 
@@ -44,8 +43,6 @@
 #include "kdevmainwindow.h"
 #include "kdevlanguagesupport.h"
 #include "kdevplugincontroller.h"
-#include "kdevdocumentcontroller.h"
-#include "projectcontroller.h"
 #include "languagecontroller.h"
 #include "partcontroller.h"
 
@@ -63,7 +60,7 @@
     KDevEnv *environment;
     KDevMainWindow *mainWindow;
     PartController *partController;
-    ProjectController *projectController;
+    KDevProjectController *projectController;
     LanguageController *languageController;
     KDevPluginController *pluginController;
     KDevDocumentController *documentController;
@@ -95,12 +92,12 @@
     d->environment = environment;
 }
 
-ProjectController *KDevCore::projectController()
+KDevProjectController *KDevCore::projectController()
 {
     return d->projectController;
 }
 
-void KDevCore::setProjectController( ProjectController *projectController )
+void KDevCore::setProjectController( KDevProjectController *projectController )
 {
     d->projectController = projectController;
 }
--- branches/work/kdev-its-gonna-be-great/lib/kdevcore.h #567608:567609
@@ -47,7 +47,7 @@
 
 class KDevEnv;
 class KDevProject;
-class ProjectController;
+class KDevProjectController;
 class KDevLanguageSupport;
 class LanguageController;
 class PartController;
@@ -76,8 +76,8 @@
     static KDevEnv *environment();
     static void setEnvironment( KDevEnv *environment );
 
-    static ProjectController *projectController();
-    static void setProjectController( ProjectController *project );
+    static KDevProjectController *projectController();
+    static void setProjectController( KDevProjectController *projectController );
     static KDevProject* activeProject();
 
     static KDevMainWindow *mainWindow();
--- branches/work/kdev-its-gonna-be-great/lib/kdevmainwindow.cpp #567608:567609
@@ -46,8 +46,7 @@
 #include "shellextension.h"
 #include "mainwindowshare.h"
 #include "kdevplugincontroller.h"
-#include "projectcontroller.h" 
-// #include "documentationpart.h"
+#include "kdevprojectcontroller.h"
 #include "kdevdocumentcontroller.h"
 
 KDevMainWindow::KDevMainWindow( QWidget *parent, Qt::WFlags flags )
--- branches/work/kdev-its-gonna-be-great/src/main.cpp #567608:567609
@@ -18,7 +18,7 @@
 #include "languagecontroller.h"
 #include "splashscreen.h"
 #include "kdevplugincontroller.h"
-#include "projectcontroller.h"
+#include "kdevprojectcontroller.h"
 #include "kdevdocumentcontroller.h"
 
 #include "kdevideextension.h"
@@ -104,7 +104,7 @@
     KDevCore::setPartController( new PartController );
     KDevCore::setDocumentController( new KDevDocumentController );
     KDevCore::setLanguageController( new LanguageController );
-    KDevCore::setProjectController( new ProjectController );
+    KDevCore::setProjectController( new KDevProjectController );
 
     QObject::connect( KDevCore::pluginController(),
                       SIGNAL( loadingPlugin( const QString & ) ),
[prev in list] [next in list] [prev in thread] [next in thread]