Re: Upload plugin for KDevelop4
Niko Sams <[email protected]>
| Newsgroups | gmane.comp.kde.devel.quanta.user |
|---|---|
| Message-ID | <[email protected]> |
ok, some linking problems. apply the attached patch andit should work. (I will commit it in about two hours) Niko PS: I would not install in /usr, only gentoo should install there. instead use either /usr/local or install it in your home (I prefer the later) _______________________________________________ Quanta mailing list [email protected] https://mail.kde.org/mailman/listinfo/quanta
upload-linking.diff
(application/octet-stream, 4.2 KB)
Index: profilesfiletree.cpp
===================================================================
--- profilesfiletree.cpp (Revision 1050771)
+++ profilesfiletree.cpp (Arbeitskopie)
@@ -19,7 +19,7 @@
#include <kfiletreeview.h>
#include <klocale.h>
-#include <core.h>
+#include <icore.h>
#include <idocument.h>
#include <idocumentcontroller.h>
@@ -101,7 +101,7 @@
void ProfilesFileTree::openUrl(const KUrl& url)
{
kDebug(24000) << "openUrl" << url;
- KDevelop::Core::self()->documentController()->openDocument(url);
+ KDevelop::ICore::self()->documentController()->openDocument(url);
}
void ProfilesFileTree::dataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
{
Index: uploaddialog.cpp
===================================================================
--- uploaddialog.cpp (Revision 1050771)
+++ uploaddialog.cpp (Arbeitskopie)
@@ -24,7 +24,7 @@
#include <kio/netaccess.h>
#include <kparts/mainwindow.h>
-#include <core.h>
+#include <icore.h>
#include <iuicontroller.h>
#include <iproject.h>
#include <iprojectcontroller.h>
Index: uploadpreferences.cpp
===================================================================
--- uploadpreferences.cpp (Revision 1050771)
+++ uploadpreferences.cpp (Arbeitskopie)
@@ -17,7 +17,7 @@
#include <kurl.h>
#include <kdebug.h>
-#include <core.h>
+#include <icore.h>
#include <iplugincontroller.h>
#include <iprojectcontroller.h>
#include <iproject.h>
@@ -37,7 +37,7 @@
: KCModule( UploadPreferencesFactory::componentData(), parent, args )
{
IProject* project = 0;
- Q_FOREACH (IProject* p, KDevelop::Core::self()->projectController()->projects()) {
+ Q_FOREACH (IProject* p, KDevelop::ICore::self()->projectController()->projects()) {
if (p->projectFileUrl() == args.at(1).toString()) {
project = p;
break;
Index: kdevuploadplugin.cpp
===================================================================
--- kdevuploadplugin.cpp (Revision 1050771)
+++ kdevuploadplugin.cpp (Arbeitskopie)
@@ -28,12 +28,11 @@
#include <iproject.h>
#include <iprojectcontroller.h>
#include <iuicontroller.h>
+#include <iplugincontroller.h>
#include <context.h>
#include <contextmenuextension.h>
#include <projectmodel.h>
-#include <core.h>
#include <ioutputview.h>
-#include <plugincontroller.h>
#include "uploaddialog.h"
#include "profilesfiletree.h"
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt (Revision 1050771)
+++ CMakeLists.txt (Arbeitskopie)
@@ -10,7 +10,6 @@
${CMAKE_CURRENT_SOURCE_DIR}
${KDEVPLATFORM_INCLUDE_DIR}
${KDEVPLATFORM_INCLUDE_DIR}/interfaces
- ${KDEVPLATFORM_INCLUDE_DIR}/shell
${KDEVPLATFORM_INCLUDE_DIR}/project
${KDEVPLATFORM_INCLUDE_DIR}/outputview
)
@@ -36,7 +35,14 @@
kde4_add_plugin(kdevupload WITH_PREFIX ${kdevupload_PART_SRCS})
-target_link_libraries(kdevupload kdevquanta kdevplatforminterfaces kdevplatformproject ${KDE4_KIO_LIBS} ${KDE4_KUTILS_LIBS} ${KDE4_KFILE_LIBS} kdevplatformshell ${KDE4_KTEXTEDITOR_LIBS})
+target_link_libraries(kdevupload
+ ${KDEVPLATFORM_INTERFACES_LIBRARIES}
+ ${KDEVPLATFORM_PROJECT_LIBRARIES}
+ ${KDE4_KIO_LIBS}
+ ${KDE4_KUTILS_LIBS}
+ ${KDE4_KFILE_LIBS}
+ ${KDE4_KTEXTEDITOR_LIBS}
+)
install(TARGETS kdevupload DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES kdevupload.desktop DESTINATION ${SERVICES_INSTALL_DIR})
@@ -54,7 +60,12 @@
kde4_add_plugin(kcm_kdev_upload ${uploadpreferences_PART_SRCS})
-target_link_libraries(kcm_kdev_upload kdevquanta kdevplatforminterfaces ${KDE4_KIO_LIBS} ${KDE4_KUTILS_LIBS} kdevplatformshell ${KDE4_KFILE_LIBS})
+target_link_libraries(kcm_kdev_upload
+ ${KDEVPLATFORM_INTERFACES_LIBRARIES}
+ ${KDE4_KIO_LIBS}
+ ${KDE4_KUTILS_LIBS}
+ ${KDE4_KFILE_LIBS}
+)
install(TARGETS kcm_kdev_upload DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES kcm_kdev_upload.desktop DESTINATION ${SERVICES_INSTALL_DIR})
Index: allprofilesmodel.cpp
===================================================================
--- allprofilesmodel.cpp (Revision 1050771)
+++ allprofilesmodel.cpp (Arbeitskopie)
@@ -14,7 +14,6 @@
#include <iproject.h>
#include <projectmodel.h>
#include <iprojectcontroller.h>
-#include <core.h>
#include <kconfiggroup.h>
#include <kfileitem.h>