diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2014-03-02 20:05:33 +0100 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2014-03-02 20:05:33 +0100 |
commit | 722ce1efbac31c61b1d4b13f7e075c9f311e3e73 (patch) | |
tree | db1b6b28566e5fe9accb4a688f7257673cecb080 /parts/astyle | |
parent | afb74575caf7dd8ccb6c235b1c8d788e320c19da (diff) | |
download | tdevelop-722ce1efbac31c61b1d4b13f7e075c9f311e3e73.tar.gz tdevelop-722ce1efbac31c61b1d4b13f7e075c9f311e3e73.zip |
Finish renaming tdevelop components
Diffstat (limited to 'parts/astyle')
-rw-r--r-- | parts/astyle/CMakeLists.txt | 8 | ||||
-rw-r--r-- | parts/astyle/Makefile.am | 14 | ||||
-rw-r--r-- | parts/astyle/astyle_adaptor.cpp | 6 | ||||
-rw-r--r-- | parts/astyle/astyle_adaptor.h | 6 | ||||
-rw-r--r-- | parts/astyle/astyle_part.cpp | 24 | ||||
-rw-r--r-- | parts/astyle/astyle_part.h | 8 | ||||
-rw-r--r-- | parts/astyle/astyle_widget.cpp | 2 | ||||
-rw-r--r-- | parts/astyle/astyle_widget.h | 2 | ||||
-rw-r--r-- | parts/astyle/tdevastyle.desktop (renamed from parts/astyle/kdevastyle.desktop) | 2 | ||||
-rw-r--r-- | parts/astyle/tdevpart_astyle.rc (renamed from parts/astyle/kdevpart_astyle.rc) | 0 |
10 files changed, 36 insertions, 36 deletions
diff --git a/parts/astyle/CMakeLists.txt b/parts/astyle/CMakeLists.txt index bac3e50a..aba6c00f 100644 --- a/parts/astyle/CMakeLists.txt +++ b/parts/astyle/CMakeLists.txt @@ -28,13 +28,13 @@ link_directories( ##### other data ################################ -install( FILES kdevastyle.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kdevpart_astyle.rc DESTINATION ${DATA_INSTALL_DIR}/kdevastyle ) +install( FILES tdevastyle.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES tdevpart_astyle.rc DESTINATION ${DATA_INSTALL_DIR}/tdevastyle ) -##### libkdevastyle (module) #################### +##### libtdevastyle (module) #################### -tde_add_kpart( libkdevastyle AUTOMOC +tde_add_kpart( libtdevastyle AUTOMOC SOURCES astyle_part.cpp astyleconfig.ui astyle_widget.cpp astyle_adaptor.cpp diff --git a/parts/astyle/Makefile.am b/parts/astyle/Makefile.am index 739ba2b8..4247625d 100644 --- a/parts/astyle/Makefile.am +++ b/parts/astyle/Makefile.am @@ -1,16 +1,16 @@ INCLUDES = -I$(top_srcdir)/lib/astyle -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libkdevastyle.la -libkdevastyle_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libkdevastyle_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ +kde_module_LTLIBRARIES = libtdevastyle.la +libtdevastyle_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libtdevastyle_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ $(top_builddir)/lib/astyle/libastyle.la -libkdevastyle_la_SOURCES = astyle_part.cpp astyleconfig.ui astyle_widget.cpp astyle_adaptor.cpp +libtdevastyle_la_SOURCES = astyle_part.cpp astyleconfig.ui astyle_widget.cpp astyle_adaptor.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = kdevastyle.desktop +service_DATA = tdevastyle.desktop -rc_DATA = kdevpart_astyle.rc -rcdir = $(kde_datadir)/kdevastyle +rc_DATA = tdevpart_astyle.rc +rcdir = $(kde_datadir)/tdevastyle diff --git a/parts/astyle/astyle_adaptor.cpp b/parts/astyle/astyle_adaptor.cpp index 05fb0901..6f6bed50 100644 --- a/parts/astyle/astyle_adaptor.cpp +++ b/parts/astyle/astyle_adaptor.cpp @@ -38,7 +38,7 @@ string ASStringIterator::nextLine() } -KDevFormatter::KDevFormatter(const TQMap<TQString, TQVariant>& options) +TDevFormatter::TDevFormatter(const TQMap<TQString, TQVariant>& options) { // for ( TQMap<TQString, TQVariant>::ConstIterator iter = options.begin();iter != options.end();iter++ ) // { @@ -116,7 +116,7 @@ KDevFormatter::KDevFormatter(const TQMap<TQString, TQVariant>& options) setSingleStatementsMode(!options["KeepStatements"].toBool()); } -KDevFormatter::KDevFormatter( AStyleWidget * widget ) +TDevFormatter::TDevFormatter( AStyleWidget * widget ) { setCStyle(); @@ -215,7 +215,7 @@ KDevFormatter::KDevFormatter( AStyleWidget * widget ) setSingleStatementsMode( !widget->Keep_Statements->isChecked() ); } -bool KDevFormatter::predefinedStyle( const TQString & style ) +bool TDevFormatter::predefinedStyle( const TQString & style ) { if (style == "ANSI") { diff --git a/parts/astyle/astyle_adaptor.h b/parts/astyle/astyle_adaptor.h index 21398fbb..df2ab818 100644 --- a/parts/astyle/astyle_adaptor.h +++ b/parts/astyle/astyle_adaptor.h @@ -33,12 +33,12 @@ private: class AStyleWidget; -class KDevFormatter : public astyle::ASFormatter +class TDevFormatter : public astyle::ASFormatter { public: - KDevFormatter(const TQMap<TQString, TQVariant>& options); - KDevFormatter( AStyleWidget * widget ); + TDevFormatter(const TQMap<TQString, TQVariant>& options); + TDevFormatter( AStyleWidget * widget ); TQString indentString() const { return m_indentString; diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp index 16d590ab..57d032c8 100644 --- a/parts/astyle/astyle_part.cpp +++ b/parts/astyle/astyle_part.cpp @@ -7,7 +7,7 @@ #include <tdeversion.h> #include <kdebug.h> #include <kdialogbase.h> -#include <kdevgenericfactory.h> +#include <tdevgenericfactory.h> #include <kiconloader.h> #include <tdelocale.h> #include <tdeparts/part.h> @@ -17,10 +17,10 @@ #include <tdetexteditor/viewcursorinterface.h> #include <tdetexteditor/selectioninterface.h> #include <kprogress.h> -#include <kdevcore.h> -#include <kdevapi.h> -#include <kdevpartcontroller.h> -#include <kdevplugininfo.h> +#include <tdevcore.h> +#include <tdevapi.h> +#include <tdevpartcontroller.h> +#include <tdevplugininfo.h> #include <configwidgetproxy.h> #include <tdeapplication.h> #include <tdeconfig.h> @@ -33,22 +33,22 @@ #include "astyle_widget.h" #include "astyle_adaptor.h" -static const KDevPluginInfo data("kdevastyle"); +static const TDevPluginInfo data("tdevastyle"); namespace { const char* defaultFormatExtensions = "*.cpp *.h *.hpp,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff ,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm"; } -typedef KDevGenericFactory<AStylePart> AStyleFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevastyle, AStyleFactory( data ) ) +typedef TDevGenericFactory<AStylePart> AStyleFactory; +K_EXPORT_COMPONENT_FACTORY( libtdevastyle, AStyleFactory( data ) ) AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &) : KDevSourceFormatter(&data, parent, name ? name : "AStylePart") { setInstance(AStyleFactory::instance()); - setXMLFile("kdevpart_astyle.rc"); + setXMLFile("tdevpart_astyle.rc"); formatTextAction = new TDEAction(i18n("&Reformat Source"), 0, this, TQT_SLOT(beautifySource()), actionCollection(), "edit_astyle"); formatTextAction->setEnabled(false); @@ -161,7 +161,7 @@ void AStylePart::beautifySource() //if there is a selection, we only format it. ASStringIterator is(has_selection ? sel_iface->selection() : iface->text()); - KDevFormatter formatter(m_project); + TDevFormatter formatter(m_project); formatter.init(&is); @@ -346,7 +346,7 @@ void AStylePart::activePartChanged ( KParts::Part *part ) TQString AStylePart::formatSource( const TQString text, AStyleWidget * widget, const TQMap<TQString, TQVariant>& options ) { ASStringIterator is(text); - KDevFormatter * formatter = ( widget)? new KDevFormatter( widget ) : new KDevFormatter(options); + TDevFormatter * formatter = ( widget)? new TDevFormatter( widget ) : new TDevFormatter(options); formatter->init(&is); @@ -390,7 +390,7 @@ TQString AStylePart::formatSource( const TQString text ) TQString AStylePart::indentString( ) const { - KDevFormatter formatter(m_project); + TDevFormatter formatter(m_project); return formatter.indentString(); } diff --git a/parts/astyle/astyle_part.h b/parts/astyle/astyle_part.h index 61b5a382..675bada5 100644 --- a/parts/astyle/astyle_part.h +++ b/parts/astyle/astyle_part.h @@ -3,14 +3,14 @@ */ -#ifndef __KDEVPART_ASTYLE_H__ -#define __KDEVPART_ASTYLE_H__ +#ifndef __TDEVPART_ASTYLE_H__ +#define __TDEVPART_ASTYLE_H__ class KDialogBase; -#include <kdevsourceformatter.h> +#include <tdevsourceformatter.h> #include <tdeaction.h> #include <tdeparts/part.h> -#include <kdevplugin.h> +#include <tdevplugin.h> #include <kdebug.h> #include <tqmap.h> #include <tqvariant.h> diff --git a/parts/astyle/astyle_widget.cpp b/parts/astyle/astyle_widget.cpp index a70c6771..bcb810e5 100644 --- a/parts/astyle/astyle_widget.cpp +++ b/parts/astyle/astyle_widget.cpp @@ -10,7 +10,7 @@ #include <tqspinbox.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kdevcore.h> +#include <tdevcore.h> AStyleWidget::AStyleWidget(AStylePart * part, bool global, TQWidget *parent, const char *name) diff --git a/parts/astyle/astyle_widget.h b/parts/astyle/astyle_widget.h index 91963e54..89b3f2cd 100644 --- a/parts/astyle/astyle_widget.h +++ b/parts/astyle/astyle_widget.h @@ -4,7 +4,7 @@ #include "astyleconfig.h" class AStylePart; -class KDevPart; +class TDevPart; class AStyleWidget : public AStyleConfig diff --git a/parts/astyle/kdevastyle.desktop b/parts/astyle/tdevastyle.desktop index ceeaabfc..b77c4745 100644 --- a/parts/astyle/kdevastyle.desktop +++ b/parts/astyle/tdevastyle.desktop @@ -76,7 +76,7 @@ GenericName[zh_CN]=源代码格式化 GenericName[zh_TW]=程式源碼格式器 Icon=tdevelop ServiceTypes=TDevelop/SourceFormatter -X-TDE-Library=libkdevastyle +X-TDE-Library=libtdevastyle X-TDevelop-Version=5 X-TDevelop-Scope=Project X-TDevelop-Properties=CDevelopment,CPPDevelopment,JavaDevelopment diff --git a/parts/astyle/kdevpart_astyle.rc b/parts/astyle/tdevpart_astyle.rc index 69037425..69037425 100644 --- a/parts/astyle/kdevpart_astyle.rc +++ b/parts/astyle/tdevpart_astyle.rc |