API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Jul 21st, 2017
69
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 8.04 KB | None | 0 0
raw download clone embed print report
  1. Index: automakeprojectmodel.cpp
  2. ===================================================================
  3. --- automakeprojectmodel.cpp (revision 1219903)
  4. +++ automakeprojectmodel.cpp (working copy)
  5. @@ -21,7 +21,7 @@
  6.  
  7. #include "automakeprojectmodel.h"
  8.  
  9. -AutoMakeDirItem::AutoMakeDirItem( KDevelop::IProject* p, const KUrl& url, QStandardItem* parent )
  10. +AutoMakeDirItem::AutoMakeDirItem( KDevelop::IProject* p, const KUrl& url, KDevelop::ProjectBaseItem* parent )
  11. : KDevelop::ProjectBuildFolderItem( p, url, parent )
  12. {
  13. }
  14. @@ -31,7 +31,7 @@
  15. }
  16.  
  17.  
  18. -AutoMakeFileItem::AutoMakeFileItem( KDevelop::IProject* p, const KUrl& url, QStandardItem* parent )
  19. +AutoMakeFileItem::AutoMakeFileItem( KDevelop::IProject* p, const KUrl& url, KDevelop::ProjectBaseItem* parent )
  20. : KDevelop::ProjectFileItem( p, url, parent )
  21. {
  22. }
  23. @@ -40,7 +40,7 @@
  24. {
  25. }
  26.  
  27. -AutoMakeTargetItem::AutoMakeTargetItem( KDevelop::IProject* p, const TargetInfo& target, QStandardItem* parent )
  28. +AutoMakeTargetItem::AutoMakeTargetItem( KDevelop::IProject* p, const TargetInfo& target, KDevelop::ProjectBaseItem* parent )
  29. : KDevelop::ProjectTargetItem( p, target.url.pathOrUrl(), parent )
  30. {
  31. m_target = target;
  32. @@ -51,7 +51,7 @@
  33. {
  34. }
  35.  
  36. -AutoMakeBaseItem::AutoMakeBaseItem( KDevelop::IProject* p, const QString& target, QStandardItem* parent )
  37. +AutoMakeBaseItem::AutoMakeBaseItem( KDevelop::IProject* p, const QString& target, KDevelop::ProjectBaseItem* parent )
  38. : KDevelop::ProjectBaseItem( p, target, parent )
  39. {
  40. }
  41. Index: automakeprojectmodel.h
  42. ===================================================================
  43. --- automakeprojectmodel.h (revision 1219903)
  44. +++ automakeprojectmodel.h (working copy)
  45. @@ -30,7 +30,7 @@
  46. class AutoMakeDirItem : public KDevelop::ProjectBuildFolderItem
  47. {
  48. public:
  49. - explicit AutoMakeDirItem( KDevelop::IProject*, const KUrl& url, QStandardItem* parent = 0 );
  50. + explicit AutoMakeDirItem( KDevelop::IProject*, const KUrl& url, KDevelop::ProjectBaseItem* parent = 0 );
  51. virtual ~AutoMakeDirItem();
  52.  
  53. virtual KDevelop::ProjectFolderItem* folder() const
  54. @@ -45,7 +45,7 @@
  55. class AutoMakeFileItem : public KDevelop::ProjectFileItem
  56. {
  57. public:
  58. - explicit AutoMakeFileItem( KDevelop::IProject*, const KUrl& url, QStandardItem* parent = 0 );
  59. + explicit AutoMakeFileItem( KDevelop::IProject*, const KUrl& url, KDevelop::ProjectBaseItem* parent = 0 );
  60. virtual ~AutoMakeFileItem();
  61.  
  62. virtual KDevelop::ProjectFileItem* file() const
  63. @@ -57,7 +57,7 @@
  64. class AutoMakeTargetItem : public KDevelop::ProjectTargetItem
  65. {
  66. public:
  67. - explicit AutoMakeTargetItem( KDevelop::IProject*, const TargetInfo& target, QStandardItem* parent = 0 );
  68. + explicit AutoMakeTargetItem( KDevelop::IProject*, const TargetInfo& target, KDevelop::ProjectBaseItem* parent = 0 );
  69.  
  70. virtual ~AutoMakeTargetItem();
  71.  
  72. @@ -82,7 +82,7 @@
  73. class AutoMakeBaseItem : public KDevelop::ProjectBaseItem
  74. {
  75. public:
  76. - explicit AutoMakeBaseItem( KDevelop::IProject*, const QString& target, QStandardItem* parent = 0 );
  77. + explicit AutoMakeBaseItem( KDevelop::IProject*, const QString& target, KDevelop::ProjectBaseItem* parent = 0 );
  78. virtual ~AutoMakeBaseItem();
  79.  
  80. virtual int type() const;
  81. Index: automakeimporter.cpp
  82. ===================================================================
  83. --- automakeimporter.cpp (revision 1219903)
  84. +++ automakeimporter.cpp (working copy)
  85. @@ -41,6 +41,8 @@
  86. const QVariantList& )
  87. : KDevelop::IPlugin( AutotoolsSupportFactory::componentData(), parent ), m_rootItem(0L)
  88. {
  89. +KDEV_USE_EXTENSION_INTERFACE( KDevelop::IBuildSystemManager )
  90. +KDEV_USE_EXTENSION_INTERFACE( KDevelop::IProjectFileManager )
  91. m_interface = new MakefileInterface( this );
  92.  
  93. IPlugin* i = core()->pluginController()->pluginForExtension( "org.kdevelop.IAutomakeBuilder" );
  94. @@ -143,7 +145,7 @@
  95. m_projectRoot[project] = folderUrl;
  96.  
  97. m_rootItem = new AutoMakeDirItem( project, folderUrl.url(), 0 );
  98. - m_rootItem->setProjectRoot(true);
  99. +// m_rootItem->setProjectRoot(true);
  100. return m_rootItem;
  101. }
  102.  
  103. Index: kdevautomakeimporter.desktop
  104. ===================================================================
  105. --- kdevautomakeimporter.desktop (revision 1219903)
  106. +++ kdevautomakeimporter.desktop (working copy)
  107. @@ -27,10 +27,10 @@
  108. X-KDE-PluginInfo-Email=mattr@kde.org
  109. X-KDE-PluginInfo-Version=0.1
  110. X-KDE-PluginInfo-Name=KDevAutotoolsImporter
  111. +X-KDE-PluginInfo-Category=Project Management
  112. X-KDevelop-FileManager=GNU Autotools
  113. -X-KDevelop-Version=9
  114. +X-KDevelop-Version=11
  115. X-KDevelop-Interfaces=org.kdevelop.IBuildSystemManager,org.kdevelop.IProjectFileManager
  116. -X-KDevelop-IRequired=org.kdevelop.IAutomakeBuilder
  117. X-KDevelop-Mode=NoGUI
  118. X-KDevelop-ProjectFilesFilter=*.am
  119. X-KDevelop-ProjectFilesFilterDescription=Automake Project Files
  120. Index: automakebuilder/kdevautomakebuilder.desktop
  121. ===================================================================
  122. --- automakebuilder/kdevautomakebuilder.desktop (revision 1219903)
  123. +++ automakebuilder/kdevautomakebuilder.desktop (working copy)
  124. @@ -36,8 +36,9 @@
  125. ServiceTypes=KDevelop/Plugin
  126. X-KDE-Library=kdevautomakebuilder
  127. X-KDE-PluginInfo-Name=KDevAutomakeBuilder
  128. +X-KDE-PluginInfo-Category=Project Management
  129. X-KDevelop-ProjectBuilder=Automake
  130. -X-KDevelop-Version=9
  131. +X-KDevelop-Version=11
  132. X-KDevelop-Category=Project
  133. X-KDevelop-Interfaces=org.kdevelop.IAutomakeBuilder
  134. X-KDevelop-IRequired=org.kdevelop.IMakeBuilder
  135. Index: automakebuilder/iautomakebuilder.h
  136. ===================================================================
  137. --- automakebuilder/iautomakebuilder.h (revision 1219903)
  138. +++ automakebuilder/iautomakebuilder.h (working copy)
  139. @@ -22,8 +22,9 @@
  140. #define IAUTOMAKEBUILDER_H
  141.  
  142. #include <project/interfaces/iprojectbuilder.h>
  143. -#include <interfaces/iextension.h>
  144. +#include <interfaces/iplugin.h>
  145.  
  146. +
  147. class IProject;
  148. class ProjectItem;
  149.  
  150. @@ -38,7 +39,7 @@
  151.  
  152. };
  153.  
  154. -KDEV_DECLARE_EXTENSION_INTERFACE( IAutomakeBuilder, "org.kdevelop.IAutomakeBuilder" )
  155. +//KDEV_DECLARE_EXTENSION_INTERFACE( IAutomakeBuilder, "org.kdevelop.IAutomakeBuilder" )
  156. Q_DECLARE_INTERFACE( IAutomakeBuilder, "org.kdevelop.IAutomakeBuilder" )
  157.  
  158. #endif
  159. Index: automakeimporter.h
  160. ===================================================================
  161. --- automakeimporter.h (revision 1219903)
  162. +++ automakeimporter.h (working copy)
  163. @@ -25,7 +25,8 @@
  164. #include <QList>
  165. #include <QString>
  166. #include <QtCore/QVariant>
  167. -#include <kdevplatform/project/interfaces/ibuildsystemmanager.h>
  168. +#include <project/interfaces/iprojectfilemanager.h>
  169. +#include <project/interfaces/ibuildsystemmanager.h>
  170. #include <interfaces/iplugin.h>
  171.  
  172. class QObject;
  173. @@ -35,18 +36,20 @@
  174. class QDir;
  175. class IAutomakeBuilder;
  176.  
  177. +
  178. namespace KDevelop
  179. {
  180. - class IProject;
  181. - class IProjectBuilder;
  182. - class ProjectBaseItem;
  183. + class IProject;
  184. + class ProjectItem;
  185. + class ProjectFolderItem;
  186. + class ProjectBaseItem;
  187. class ProjectFileItem;
  188. - class ProjectFolderItem;
  189. class ProjectTargetItem;
  190. + class IProjectBuilder;
  191. }
  192.  
  193.  
  194. -class AutoMakeImporter : public KDevelop::IPlugin, KDevelop::IBuildSystemManager
  195. +class AutoMakeImporter : public KDevelop::IPlugin, public KDevelop::IBuildSystemManager
  196. {
  197. Q_OBJECT
  198. Q_INTERFACES( KDevelop::IBuildSystemManager )
  199. @@ -84,6 +87,9 @@
  200. virtual bool removeFile( KDevelop::ProjectFileItem* ) { return false; }
  201. virtual bool removeFileFromTarget( KDevelop::ProjectFileItem*,
  202. KDevelop::ProjectTargetItem* ) { return false; }
  203. +
  204. + virtual bool removeFilesAndFolders(QList<KDevelop::ProjectBaseItem*>){return false;}
  205. + virtual bool removeFilesFromTargets(QList<QPair<KDevelop::ProjectTargetItem*, KDevelop::ProjectFileItem*> >){return false;}
  206.  
  207. virtual bool renameFile(KDevelop::ProjectFileItem*, const KUrl&) { return false; }
  208. virtual bool renameFolder(KDevelop::ProjectFolderItem*, const KUrl&) { return false; }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!