diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-25 15:37:31 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-25 15:37:31 +0900 |
commit | 6392f5a9dfce2bf83617d49bb7f332181ec6004e (patch) | |
tree | ab69e390f7962b7e7dda1a3a64f035c61c751cf4 /parts/outputviews | |
parent | aba2788b428dc53243407902e9ccbb20b97a69fd (diff) | |
download | tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip |
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'parts/outputviews')
-rw-r--r-- | parts/outputviews/CMakeLists.txt | 26 | ||||
-rw-r--r-- | parts/outputviews/Makefile.am | 32 | ||||
-rw-r--r-- | parts/outputviews/appoutputviewpart.cpp | 28 | ||||
-rw-r--r-- | parts/outputviews/appoutputviewpart.h | 10 | ||||
-rw-r--r-- | parts/outputviews/appoutputwidget.cpp | 6 | ||||
-rw-r--r-- | parts/outputviews/kdevappoutputview.desktop (renamed from parts/outputviews/tdevappoutputview.desktop) | 8 | ||||
-rw-r--r-- | parts/outputviews/kdevmakeview.desktop (renamed from parts/outputviews/tdevmakeview.desktop) | 4 | ||||
-rw-r--r-- | parts/outputviews/kdevmakeview.rc (renamed from parts/outputviews/tdevmakeview.rc) | 2 | ||||
-rw-r--r-- | parts/outputviews/makeactionfilter.cpp | 24 | ||||
-rw-r--r-- | parts/outputviews/makeviewpart.cpp | 28 | ||||
-rw-r--r-- | parts/outputviews/makeviewpart.h | 10 | ||||
-rw-r--r-- | parts/outputviews/makewidget.cpp | 8 | ||||
-rw-r--r-- | parts/outputviews/outputviewsfactory.cpp | 6 | ||||
-rw-r--r-- | parts/outputviews/outputviewsfactory.h | 8 |
14 files changed, 100 insertions, 100 deletions
diff --git a/parts/outputviews/CMakeLists.txt b/parts/outputviews/CMakeLists.txt index 18effab8..48cf38ec 100644 --- a/parts/outputviews/CMakeLists.txt +++ b/parts/outputviews/CMakeLists.txt @@ -30,40 +30,40 @@ link_directories( ##### other data ################################ install( FILES - tdevappoutputview.desktop tdevmakeview.desktop + kdevappoutputview.desktop kdevmakeview.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES - tdevmakeview.rc - DESTINATION ${DATA_INSTALL_DIR}/tdevappoutputview ) + kdevmakeview.rc + DESTINATION ${DATA_INSTALL_DIR}/kdevappoutputview ) install( FILES - tdevmakeview.rc - DESTINATION ${DATA_INSTALL_DIR}/tdevmakeview ) + kdevmakeview.rc + DESTINATION ${DATA_INSTALL_DIR}/kdevmakeview ) -##### libtdevmakeview (module) ################## +##### libkdevmakeview (module) ################## -tde_add_kpart( libtdevmakeview AUTOMOC +tde_add_kpart( libkdevmakeview AUTOMOC SOURCES makeviewpart.cpp makewidget.cpp directorystatusmessagefilter.cpp outputfilter.cpp compileerrorfilter.cpp commandcontinuationfilter.cpp makeitem.cpp makeactionfilter.cpp otherfilter.cpp LINK - tdevdcopextensions-static tdevextensions-static - tdevwidgets-shared tdevelop-shared + kdevdcopextensions-static kdevextensions-static + kdevwidgets-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) -##### libtdevappview (module) ################### +##### libkdevappview (module) ################### -tde_add_kpart( libtdevappview AUTOMOC +tde_add_kpart( libkdevappview AUTOMOC SOURCES appoutputviewpart.cpp appoutputwidget.cpp filterdlg.ui LINK - tdevdcopextensions-static tdevextensions-static - tdevwidgets-shared tdevelop-shared + kdevdcopextensions-static kdevextensions-static + kdevwidgets-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/parts/outputviews/Makefile.am b/parts/outputviews/Makefile.am index 6536d0f2..6a890586 100644 --- a/parts/outputviews/Makefile.am +++ b/parts/outputviews/Makefile.am @@ -4,32 +4,32 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/interfaces/extensions/dcop -I$(top_srcdir)/lib/util \ -I$(top_srcdir)/lib/widgets $(all_includes) -kde_module_LTLIBRARIES = libtdevmakeview.la libtdevappview.la +kde_module_LTLIBRARIES = libkdevmakeview.la libkdevappview.la METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevappoutputview.desktop tdevmakeview.desktop +service_DATA = kdevappoutputview.desktop kdevmakeview.desktop -rc1dir = $(kde_datadir)/tdevappoutputview -rc1_DATA = tdevmakeview.rc +rc1dir = $(kde_datadir)/kdevappoutputview +rc1_DATA = kdevmakeview.rc -rc2dir = $(kde_datadir)/tdevmakeview -rc2_DATA = tdevmakeview.rc +rc2dir = $(kde_datadir)/kdevmakeview +rc2_DATA = kdevmakeview.rc noinst_HEADERS = filterdlg.h -libtdevmakeview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevmakeview_la_LIBADD = $(top_builddir)/lib/widgets/libtdevwidgets.la \ - $(top_builddir)/lib/interfaces/extensions/dcop/libtdevdcopextensions.la $(top_builddir)/lib/libtdevelop.la \ - $(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la -libtdevmakeview_la_SOURCES = makeviewpart.cpp makewidget.cpp \ +libkdevmakeview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevmakeview_la_LIBADD = $(top_builddir)/lib/widgets/libkdevwidgets.la \ + $(top_builddir)/lib/interfaces/extensions/dcop/libkdevdcopextensions.la $(top_builddir)/lib/libtdevelop.la \ + $(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la +libkdevmakeview_la_SOURCES = makeviewpart.cpp makewidget.cpp \ directorystatusmessagefilter.cpp outputfilter.cpp compileerrorfilter.cpp commandcontinuationfilter.cpp \ makeitem.cpp makeactionfilter.cpp otherfilter.cpp -libtdevappview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevappview_la_LIBADD = $(top_builddir)/lib/widgets/libtdevwidgets.la \ - $(top_builddir)/lib/interfaces/extensions/dcop/libtdevdcopextensions.la $(top_builddir)/lib/libtdevelop.la \ - $(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la -libtdevappview_la_SOURCES = appoutputviewpart.cpp appoutputwidget.cpp \ +libkdevappview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevappview_la_LIBADD = $(top_builddir)/lib/widgets/libkdevwidgets.la \ + $(top_builddir)/lib/interfaces/extensions/dcop/libkdevdcopextensions.la $(top_builddir)/lib/libtdevelop.la \ + $(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la +libkdevappview_la_SOURCES = appoutputviewpart.cpp appoutputwidget.cpp \ filterdlg.ui diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp index 223d3855..3a0e0e7d 100644 --- a/parts/outputviews/appoutputviewpart.cpp +++ b/parts/outputviews/appoutputviewpart.cpp @@ -18,27 +18,27 @@ #include <tdeaction.h> #include <kiconloader.h> #include <tdeparts/part.h> -#include <tdevgenericfactory.h> -#include <tdevplugininfo.h> +#include <kdevgenericfactory.h> +#include <kdevplugininfo.h> #include <tdeapplication.h> -#include "tdevproject.h" -#include "tdevcore.h" -#include "tdevmainwindow.h" +#include "kdevproject.h" +#include "kdevcore.h" +#include "kdevmainwindow.h" #include "appoutputwidget.h" -#include "tdevpartcontroller.h" +#include "kdevpartcontroller.h" #include "settings.h" -static const TDevPluginInfo data("tdevappoutputview"); -typedef TDevGenericFactory< AppOutputViewPart > AppViewFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevappview, AppViewFactory( data ) ) +static const KDevPluginInfo data("kdevappoutputview"); +typedef KDevGenericFactory< AppOutputViewPart > AppViewFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevappview, AppViewFactory( data ) ) AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const TQStringList &) - : TDevAppFrontend(&data, parent, name ? name : "AppOutputViewPart") + : KDevAppFrontend(&data, parent, name ? name : "AppOutputViewPart") { setInstance(AppViewFactory::instance()); - m_dcop = new TDevAppFrontendIface(this); + m_dcop = new KDevAppFrontendIface(this); m_widget = new AppOutputWidget(this); m_widget->setIcon( SmallIcon("openterm") ); @@ -51,8 +51,8 @@ AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const T mainWindow()->embedOutputView(m_widget, i18n("Application"), i18n("Output of the executed user program")); hideView(); - connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)), - this, TQT_SLOT(slotStopButtonClicked(TDevPlugin*)) ); + connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); connect(m_widget, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited())); connect(m_widget, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SIGNAL(processExited())); } @@ -66,7 +66,7 @@ AppOutputViewPart::~AppOutputViewPart() delete m_dcop; } -void AppOutputViewPart::slotStopButtonClicked( TDevPlugin* which ) +void AppOutputViewPart::slotStopButtonClicked( KDevPlugin* which ) { if ( which != 0 && which != this ) return; diff --git a/parts/outputviews/appoutputviewpart.h b/parts/outputviews/appoutputviewpart.h index 306108cd..1067af97 100644 --- a/parts/outputviews/appoutputviewpart.h +++ b/parts/outputviews/appoutputviewpart.h @@ -14,13 +14,13 @@ #include <tqguardedptr.h> -#include "tdevappfrontend.h" -#include "TDevAppFrontendIface.h" +#include "kdevappfrontend.h" +#include "KDevAppFrontendIface.h" class AppOutputWidget; -class AppOutputViewPart : public TDevAppFrontend +class AppOutputViewPart : public KDevAppFrontend { Q_OBJECT @@ -45,12 +45,12 @@ signals: void processExited(); private slots: - void slotStopButtonClicked(TDevPlugin*); + void slotStopButtonClicked(KDevPlugin*); void slotProcessExited(); private: TQGuardedPtr<AppOutputWidget> m_widget; - TDevAppFrontendIface *m_dcop; + KDevAppFrontendIface *m_dcop; bool m_viewIsVisible; }; diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp index 0201ce5c..50060339 100644 --- a/parts/outputviews/appoutputwidget.cpp +++ b/parts/outputviews/appoutputwidget.cpp @@ -33,9 +33,9 @@ #include "appoutputviewpart.h" #include "filterdlg.h" -#include "tdevpartcontroller.h" -#include "tdevmainwindow.h" -#include "tdevproject.h" +#include "kdevpartcontroller.h" +#include "kdevmainwindow.h" +#include "kdevproject.h" AppOutputWidget::AppOutputWidget(AppOutputViewPart* part) : ProcessWidget(0, "app output widget"), m_part(part) diff --git a/parts/outputviews/tdevappoutputview.desktop b/parts/outputviews/kdevappoutputview.desktop index 7791162d..bca43d54 100644 --- a/parts/outputviews/tdevappoutputview.desktop +++ b/parts/outputviews/kdevappoutputview.desktop @@ -34,15 +34,15 @@ Comment[tg]=Тирезаи хориҷ кардани гузориш Comment[tr]=Uygulama Çıktı Görünümü Comment[zh_CN]=应用程序输出查看器 Comment[zh_TW]=應用程式輸出檢視 -Name=TDevAppOutputView +Name=KDevAppOutputView Name[da]=TDevelop Program-uddata fremvisning Name[de]=Anwendungsausgabe (TDevelop) Name[hi]=के-डेव-एप्प-आउटपुट-व्यू Name[nds]=Programmutgaav-Kieker (TDevelop) -Name[pl]=TDevAppWidokWyjścia +Name[pl]=KDevAppWidokWyjścia Name[sk]=KDev pohľad na výstup aplikácie Name[sv]=TDevelop programutmatningsvy -Name[ta]=TDevApp வெளியீட்டுக் காட்சி +Name[ta]=KDevApp வெளியீட்டுக் காட்சி Name[zh_TW]=TDevelop 應用程式輸出檢視 GenericName=Application Output View GenericName[ca]=Visor de l'eixida de les aplicacions @@ -78,7 +78,7 @@ GenericName[zh_CN]=应用程序输出查看器 GenericName[zh_TW]=應用程式輸出檢視 Icon=exec ServiceTypes=TDevelop/AppFrontend -X-TDE-Library=libtdevappview +X-TDE-Library=libkdevappview X-TDevelop-Version=5 X-TDevelop-Scope=Core X-TDevelop-Properties=OutputTool diff --git a/parts/outputviews/tdevmakeview.desktop b/parts/outputviews/kdevmakeview.desktop index 5651f031..bfea5cec 100644 --- a/parts/outputviews/tdevmakeview.desktop +++ b/parts/outputviews/kdevmakeview.desktop @@ -35,7 +35,7 @@ Comment[tg]=Интерфейс ба талфифгар Comment[tr]=Derleyici Önucu Comment[zh_CN]=编译器前端 Comment[zh_TW]=編譯器前端介面 -Name=TDevMakeView +Name=KDevMakeView Name[da]=TDevelop Make-visning Name[de]=Make-Ausgabe (TDevelop) Name[hi]=के-डेव-मेक-व्यू @@ -81,7 +81,7 @@ GenericName[zh_CN]=编译器前端 GenericName[zh_TW]=編譯器前端介面 Icon=konsole ServiceTypes=TDevelop/MakeFrontend -X-TDE-Library=libtdevmakeview +X-TDE-Library=libkdevmakeview X-TDevelop-Version=5 X-TDevelop-Scope=Core X-TDevelop-Properties=OutputTool diff --git a/parts/outputviews/tdevmakeview.rc b/parts/outputviews/kdevmakeview.rc index 869191cb..fc8c82f6 100644 --- a/parts/outputviews/tdevmakeview.rc +++ b/parts/outputviews/kdevmakeview.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="TDevMakeView" version="1"> +<kpartgui name="KDevMakeView" version="1"> <MenuBar> <Menu name="view"> <Action name="view_next_error" group="error_operations"/> diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp index 157a2c2e..ee38d144 100644 --- a/parts/outputviews/makeactionfilter.cpp +++ b/parts/outputviews/makeactionfilter.cpp @@ -184,11 +184,11 @@ void MakeActionFilter::test() "-I/usr/X11R6/include -DTQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W " "-Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion " "-Wchar-subscripts -fno-builtin -g3 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new " - "-fno-common -MT tdevcore.lo -MD -MP -MF \".deps/tdevcore.Tpo\" -c -o tdevcore.lo `test -f " - "'/home/john/src/kde/tdevelop/lib/interfaces/tdevcore.cpp' || echo " - "'/home/john/src/kde/tdevelop/lib/interfaces/'`/home/john/src/kde/tdevelop/lib/interfaces/tdevcore.cpp; then mv " - "\".deps/tdevcore.Tpo\" \".deps/tdevcore.Plo\"; else rm -f \".deps/tdevcore.Tpo\"; exit 1; fi", - "compiling", "g++", "tdevcore.cpp" ) + "-fno-common -MT kdevcore.lo -MD -MP -MF \".deps/kdevcore.Tpo\" -c -o kdevcore.lo `test -f " + "'/home/john/src/kde/tdevelop/lib/interfaces/kdevcore.cpp' || echo " + "'/home/john/src/kde/tdevelop/lib/interfaces/'`/home/john/src/kde/tdevelop/lib/interfaces/kdevcore.cpp; then mv " + "\".deps/kdevcore.Tpo\" \".deps/kdevcore.Plo\"; else rm -f \".deps/kdevcore.Tpo\"; exit 1; fi", + "compiling", "g++", "kdevcore.cpp" ) << TestItem( // automake 1.7, srcdir != builddir "if g++ -DHAVE_CONFIG_H -I. -I/home/john/src/kde/tdevelop/src -I.. -I/home/john/src/kde/tdevelop/lib/interfaces " "-I/home/john/src/kde/tdevelop/lib/sourceinfo -I/home/john/src/kde/tdevelop/lib/util -I/home/john/src/kde/tdevelop/lib " @@ -222,12 +222,12 @@ void MakeActionFilter::test() "/bin/sh ../../libtool --silent --mode=link --tag=CXX g++ -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic " "-W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align " "-Wconversion -Wchar-subscripts -fno-builtin -g3 -Wformat-security -Wmissing-format-attribute -fno-exceptions " - "-fno-check-new -fno-common -o libtdevoutputviews.la.closure libtdevoutputviews_la_closure.lo -L/usr/X11R6/lib " + "-fno-check-new -fno-common -o libkdevoutputviews.la.closure libkdevoutputviews_la_closure.lo -L/usr/X11R6/lib " "-L/home/john/src/kde/qt-copy/lib -L/usr/local/kde/lib -avoid-version -module -no-undefined -R /usr/local/kde/lib " "-R /home/john/src/kde/qt-copy/lib -R /usr/X11R6/lib outputviewsfactory.lo makeviewpart.lo makewidget.lo " "appoutputviewpart.lo appoutputwidget.lo directorystatusmessagefilter.lo outputfilter.lo compileerrorfilter.lo " "commandcontinuationfilter.lo makeitem.lo makeactionfilter.lo otherfilter.lo ../../lib/libtdevelop.la", - "linking", "libtool", "libtdevoutputviews.la.closure" ) + "linking", "libtool", "libkdevoutputviews.la.closure" ) << TestItem( //libtool, linking 2 "/bin/sh ../libtool --silent --mode=link --tag=CXX g++ -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic " "-W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts " @@ -254,12 +254,12 @@ void MakeActionFilter::test() "echo '/home/andris/cvs-developement/head/quanta/quanta/project/'`/home/andris/cvs-developement/head/quanta/quanta/project/project.cpp ", "compiling", "g++", "project.cpp") << TestItem( - "/usr/local/kde/bin/dcopidl /home/john/src/kde/tdevelop/lib/interfaces/TDevAppFrontendIface.h > TDevAppFrontendIface.kidl " - "|| ( rm -f TDevAppFrontendIface.kidl ; /bin/false )", - "generating", "dcopidl", "TDevAppFrontendIface.kidl" ) + "/usr/local/kde/bin/dcopidl /home/john/src/kde/tdevelop/lib/interfaces/KDevAppFrontendIface.h > KDevAppFrontendIface.kidl " + "|| ( rm -f KDevAppFrontendIface.kidl ; /bin/false )", + "generating", "dcopidl", "KDevAppFrontendIface.kidl" ) << TestItem( - "/usr/local/kde/bin/dcopidl2cpp --c++-suffix cpp --no-signals --no-stub TDevAppFrontendIface.kidl", - "compiling", "dcopidl2cpp", "TDevAppFrontendIface.kidl" ) + "/usr/local/kde/bin/dcopidl2cpp --c++-suffix cpp --no-signals --no-stub KDevAppFrontendIface.kidl", + "compiling", "dcopidl2cpp", "KDevAppFrontendIface.kidl" ) << TestItem( //install "/usr/bin/install -c -p -m 644 /home/andris/development/quanta/quanta/kommander/editor/kmdr-editor.desktop " "/opt/trinity/share/applnk/Editors/kmdr-editor.desktop", "installing", "", "/opt/trinity/share/applnk/Editors/kmdr-editor.desktop") diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp index e8eb6a75..9324bcb0 100644 --- a/parts/outputviews/makeviewpart.cpp +++ b/parts/outputviews/makeviewpart.cpp @@ -17,27 +17,27 @@ #include <tdelocale.h> #include <tdeaction.h> #include <kiconloader.h> -#include <tdevgenericfactory.h> -#include <tdevplugininfo.h> +#include <kdevgenericfactory.h> +#include <kdevplugininfo.h> -#include "tdevproject.h" -#include "tdevcore.h" -#include "tdevmainwindow.h" +#include "kdevproject.h" +#include "kdevcore.h" +#include "kdevmainwindow.h" #include "makewidget.h" -static const TDevPluginInfo data("tdevmakeview"); -typedef TDevGenericFactory< MakeViewPart > MakeViewFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevmakeview, MakeViewFactory( data ) ) +static const KDevPluginInfo data("kdevmakeview"); +typedef KDevGenericFactory< MakeViewPart > MakeViewFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevmakeview, MakeViewFactory( data ) ) MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringList &) - : TDevMakeFrontend(&data, parent, name) + : KDevMakeFrontend(&data, parent, name) { setInstance(MakeViewFactory::instance()); - setXMLFile("tdevmakeview.rc"); + setXMLFile("kdevmakeview.rc"); - m_dcop = new TDevMakeFrontendIface(this); + m_dcop = new KDevMakeFrontendIface(this); m_widget = new MakeWidget(this); m_widget->setIcon( SmallIcon("exec") ); @@ -61,8 +61,8 @@ MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringLis action->setToolTip( i18n("Go to the previous error") ); action->setWhatsThis(i18n("<b>Previous error</b><p>Switches to the file and line where the previous error was reported from.")); - connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)), - this, TQT_SLOT(slotStopButtonClicked(TDevPlugin*)) ); + connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); } @@ -74,7 +74,7 @@ MakeViewPart::~MakeViewPart() delete m_dcop; } -void MakeViewPart::slotStopButtonClicked(TDevPlugin* which) +void MakeViewPart::slotStopButtonClicked(KDevPlugin* which) { if ( which != 0 && which != this ) return; diff --git a/parts/outputviews/makeviewpart.h b/parts/outputviews/makeviewpart.h index 420eebcb..89f2a8bd 100644 --- a/parts/outputviews/makeviewpart.h +++ b/parts/outputviews/makeviewpart.h @@ -14,13 +14,13 @@ #include <tqguardedptr.h> -#include "tdevmakefrontend.h" -#include "TDevMakeFrontendIface.h" +#include "kdevmakefrontend.h" +#include "KDevMakeFrontendIface.h" class MakeWidget; -class MakeViewPart : public TDevMakeFrontend +class MakeViewPart : public KDevMakeFrontend { Q_OBJECT @@ -32,7 +32,7 @@ public: virtual void updateSettingsFromConfig(); private slots: - void slotStopButtonClicked(TDevPlugin*); + void slotStopButtonClicked(KDevPlugin*); protected: virtual void queueCommand(const TQString &dir, const TQString &command); @@ -40,7 +40,7 @@ protected: private: TQGuardedPtr<MakeWidget> m_widget; - TDevMakeFrontendIface *m_dcop; + KDevMakeFrontendIface *m_dcop; friend class MakeWidget; }; diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp index 0e2e6aef..029efdc6 100644 --- a/parts/outputviews/makewidget.cpp +++ b/parts/outputviews/makewidget.cpp @@ -10,10 +10,10 @@ ***************************************************************************/ #include "makewidget.h" -#include "tdevcore.h" -#include "tdevmainwindow.h" -#include "tdevproject.h" -#include "tdevpartcontroller.h" +#include "kdevcore.h" +#include "kdevmainwindow.h" +#include "kdevproject.h" +#include "kdevpartcontroller.h" #include "processlinemaker.h" #include "makeviewpart.h" #include "makeitem.h" diff --git a/parts/outputviews/outputviewsfactory.cpp b/parts/outputviews/outputviewsfactory.cpp index d63621d6..55e5bf55 100644 --- a/parts/outputviews/outputviewsfactory.cpp +++ b/parts/outputviews/outputviewsfactory.cpp @@ -11,11 +11,11 @@ #include "outputviewsfactory.h" -static const TDevPluginInfo data("tdevoutputviews", I18N_NOOP("Messages Output"), "1.0"); +static const KDevPluginInfo data("kdevoutputviews", I18N_NOOP("Messages Output"), "1.0"); -K_EXPORT_COMPONENT_FACTORY( libtdevoutputviews, OutputViewsFactory( &data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevoutputviews, OutputViewsFactory( &data ) ) -const TDevPluginInfo *outputViewsInfo() +const KDevPluginInfo *outputViewsInfo() { return data; } diff --git a/parts/outputviews/outputviewsfactory.h b/parts/outputviews/outputviewsfactory.h index e79e60a2..4bcba666 100644 --- a/parts/outputviews/outputviewsfactory.h +++ b/parts/outputviews/outputviewsfactory.h @@ -12,16 +12,16 @@ #ifndef _OUTPUTVIEWSFACTORY_H_ #define _OUTPUTVIEWSFACTORY_H_ -#include <tdevgenericfactory.h> +#include <kdevgenericfactory.h> #include "appoutputviewpart.h" #include "makeviewpart.h" -class TDevPluginInfo; +class KDevPluginInfo; typedef K_TYPELIST_2( AppOutputViewPart, MakeViewPart ) OutputViews; -typedef TDevGenericFactory< OutputViews > OutputViewsFactory; +typedef KDevGenericFactory< OutputViews > OutputViewsFactory; -const TDevPluginInfo *outputViewsInfo(); +const KDevPluginInfo *outputViewsInfo(); #endif |