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 /languages/sql | |
parent | aba2788b428dc53243407902e9ccbb20b97a69fd (diff) | |
download | tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip |
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'languages/sql')
-rw-r--r-- | languages/sql/CMakeLists.txt | 8 | ||||
-rw-r--r-- | languages/sql/Makefile.am | 14 | ||||
-rw-r--r-- | languages/sql/app_templates/sqlsimple/CMakeLists.txt | 6 | ||||
-rw-r--r-- | languages/sql/app_templates/sqlsimple/Makefile.am | 4 | ||||
-rw-r--r-- | languages/sql/app_templates/sqlsimple/app.tdevelop | 18 | ||||
-rw-r--r-- | languages/sql/app_templates/sqlsimple/sqlsimple.kdevtemplate (renamed from languages/sql/app_templates/sqlsimple/sqlsimple.tdevtemplate) | 0 | ||||
-rw-r--r-- | languages/sql/doc/Makefile.am | 2 | ||||
-rw-r--r-- | languages/sql/kdevsqlsupport.desktop (renamed from languages/sql/tdevsqlsupport.desktop) | 2 | ||||
-rw-r--r-- | languages/sql/kdevsqlsupport.rc (renamed from languages/sql/tdevsqlsupport.rc) | 0 | ||||
-rw-r--r-- | languages/sql/sqlactions.cpp | 4 | ||||
-rw-r--r-- | languages/sql/sqlconfigwidget.ui.h | 6 | ||||
-rw-r--r-- | languages/sql/sqlsupport_part.cpp | 28 | ||||
-rw-r--r-- | languages/sql/sqlsupport_part.h | 10 |
13 files changed, 51 insertions, 51 deletions
diff --git a/languages/sql/CMakeLists.txt b/languages/sql/CMakeLists.txt index 67d5aef5..8e7d41cc 100644 --- a/languages/sql/CMakeLists.txt +++ b/languages/sql/CMakeLists.txt @@ -30,13 +30,13 @@ link_directories( ##### other data ################################ -install( FILES tdevsqlsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevsqlsupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevsqlsupport ) +install( FILES kdevsqlsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevsqlsupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevsqlsupport ) -##### libtdevsqlsupport (module) ################ +##### libkdevsqlsupport (module) ################ -tde_add_kpart( libtdevsqlsupport AUTOMOC +tde_add_kpart( libkdevsqlsupport AUTOMOC SOURCES sqlconfigwidget.ui sqlsupport_part.cpp sqlactions.cpp sqloutputwidget.cpp diff --git a/languages/sql/Makefile.am b/languages/sql/Makefile.am index eb48a72f..ba410a98 100644 --- a/languages/sql/Makefile.am +++ b/languages/sql/Makefile.am @@ -5,16 +5,16 @@ INCLUDES = -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces \ $(all_includes) SUBDIRS = app_templates doc -kde_module_LTLIBRARIES = libtdevsqlsupport.la -libtdevsqlsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevsqlsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevsqlsupport.la +libkdevsqlsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevsqlsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevsqlsupport_la_SOURCES = sqlconfigwidget.ui sqlsupport_part.cpp sqlactions.cpp sqloutputwidget.cpp +libkdevsqlsupport_la_SOURCES = sqlconfigwidget.ui sqlsupport_part.cpp sqlactions.cpp sqloutputwidget.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevsqlsupport.desktop +service_DATA = kdevsqlsupport.desktop -rcdir = $(kde_datadir)/tdevsqlsupport -rc_DATA = tdevsqlsupport.rc +rcdir = $(kde_datadir)/kdevsqlsupport +rc_DATA = kdevsqlsupport.rc diff --git a/languages/sql/app_templates/sqlsimple/CMakeLists.txt b/languages/sql/app_templates/sqlsimple/CMakeLists.txt index 290dd962..05ddb17f 100644 --- a/languages/sql/app_templates/sqlsimple/CMakeLists.txt +++ b/languages/sql/app_templates/sqlsimple/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( sqlsimple.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/sqlsimple.tar.gz sqlsimple.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - sqlsimple.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + sqlsimple.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/sql/app_templates/sqlsimple/Makefile.am b/languages/sql/app_templates/sqlsimple/Makefile.am index 1b49cc21..6bfae1c4 100644 --- a/languages/sql/app_templates/sqlsimple/Makefile.am +++ b/languages/sql/app_templates/sqlsimple/Makefile.am @@ -2,10 +2,10 @@ templateName = sqlsimple dataFiles = app.sql app.tdevelop ### no need to change below: -template_DATA = $(templateName).tdevtemplate +template_DATA = $(templateName).kdevtemplate templatedir = ${appwizarddatadir}/templates -appwizarddatadir = ${kde_datadir}/tdevappwizard +appwizarddatadir = ${kde_datadir}/kdevappwizard $(templateName).tar.gz: ${dataFiles} $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} $(GZIP_COMMAND) -f9 $(templateName).tar diff --git a/languages/sql/app_templates/sqlsimple/app.tdevelop b/languages/sql/app_templates/sqlsimple/app.tdevelop index 6977b304..7fc4efc9 100644 --- a/languages/sql/app_templates/sqlsimple/app.tdevelop +++ b/languages/sql/app_templates/sqlsimple/app.tdevelop @@ -11,22 +11,22 @@ </keywords> <ignoreparts> <part>KDevdistpart</part> - <part>TDevDebugger</part> + <part>KDevDebugger</part> </ignoreparts> </general> - <tdevscriptproject> + <kdevscriptproject> <general> <activedir>src</activedir> <includepatterns>*.sql</includepatterns> <excludepatterns>*~</excludepatterns> </general> - </tdevscriptproject> - <tdevfileview> + </kdevscriptproject> + <kdevfileview> <groups> <group pattern="*.sql" name="SQL" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -75,10 +75,10 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <useglobaltypes> <type ext="sql"/> </useglobaltypes> - </tdevfilecreate> + </kdevfilecreate> </tdevelop> diff --git a/languages/sql/app_templates/sqlsimple/sqlsimple.tdevtemplate b/languages/sql/app_templates/sqlsimple/sqlsimple.kdevtemplate index 5081e992..5081e992 100644 --- a/languages/sql/app_templates/sqlsimple/sqlsimple.tdevtemplate +++ b/languages/sql/app_templates/sqlsimple/sqlsimple.kdevtemplate diff --git a/languages/sql/doc/Makefile.am b/languages/sql/doc/Makefile.am index f6fd6d52..d42aec82 100644 --- a/languages/sql/doc/Makefile.am +++ b/languages/sql/doc/Makefile.am @@ -1,4 +1,4 @@ -#tocdir = ${kde_datadir}/tdevdoctreeview/tocs +#tocdir = ${kde_datadir}/kdevdoctreeview/tocs #toc_DATA = #indexdir = ${kde_datadir}/devdoctreeview/indices diff --git a/languages/sql/tdevsqlsupport.desktop b/languages/sql/kdevsqlsupport.desktop index 5357d127..f5ee67ab 100644 --- a/languages/sql/tdevsqlsupport.desktop +++ b/languages/sql/kdevsqlsupport.desktop @@ -79,7 +79,7 @@ GenericName[tr]=SQL Desteği GenericName[zh_CN]=SQL 支持 GenericName[zh_TW]=SQL 支援 ServiceTypes=TDevelop/LanguageSupport -X-TDE-Library=libtdevsqlsupport +X-TDE-Library=libkdevsqlsupport X-TDevelop-Version=5 X-TDevelop-Language=SQL X-TDevelop-Args=SQL diff --git a/languages/sql/tdevsqlsupport.rc b/languages/sql/kdevsqlsupport.rc index 36b91d7a..36b91d7a 100644 --- a/languages/sql/tdevsqlsupport.rc +++ b/languages/sql/kdevsqlsupport.rc diff --git a/languages/sql/sqlactions.cpp b/languages/sql/sqlactions.cpp index f737b694..1d1a5b14 100644 --- a/languages/sql/sqlactions.cpp +++ b/languages/sql/sqlactions.cpp @@ -21,8 +21,8 @@ #include <kiconloader.h> #include <kcombobox.h> -#include "tdevplugin.h" -#include "tdevlanguagesupport.h" +#include "kdevplugin.h" +#include "kdevlanguagesupport.h" #include "sqlsupport_part.h" SqlListAction::SqlListAction(SQLSupportPart *part, const TQString &text, diff --git a/languages/sql/sqlconfigwidget.ui.h b/languages/sql/sqlconfigwidget.ui.h index e58930f9..c06413e7 100644 --- a/languages/sql/sqlconfigwidget.ui.h +++ b/languages/sql/sqlconfigwidget.ui.h @@ -195,7 +195,7 @@ void SqlConfigWidget::accept() { Q_ASSERT( doc ); - TQDomElement dbElem = DomUtil::createElementByPath( *doc, "/tdevsqlsupport/servers" ); + TQDomElement dbElem = DomUtil::createElementByPath( *doc, "/kdevsqlsupport/servers" ); DomUtil::makeEmpty( dbElem ); for ( int i = 0; i < dbTable->numRows() - 1; i++ ) { @@ -206,7 +206,7 @@ void SqlConfigWidget::accept() << SQLSupportPart::cryptStr( ((PasswordTableItem*)dbTable->item( i, 5 ))->password ); DomUtil::writeListEntry( *doc, - "/tdevsqlsupport/servers/server" + TQString::number( i ), + "/kdevsqlsupport/servers/server" + TQString::number( i ), "el", db ); } if ( changed ) @@ -227,7 +227,7 @@ void SqlConfigWidget::loadConfig() TQStringList db; int i = 0; while ( true ) { - TQStringList db = DomUtil::readListEntry( *doc, "tdevsqlsupport/servers/server" + TQString::number( i ), "el" ); + TQStringList db = DomUtil::readListEntry( *doc, "kdevsqlsupport/servers/server" + TQString::number( i ), "el" ); if ( db.isEmpty() ) return; diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp index c4d0a235..2ecb2ec4 100644 --- a/languages/sql/sqlsupport_part.cpp +++ b/languages/sql/sqlsupport_part.cpp @@ -8,7 +8,7 @@ #include <tdeapplication.h> #include <kiconloader.h> #include <tdelocale.h> -#include <tdevgenericfactory.h> +#include <kdevgenericfactory.h> #include <kdebug.h> #include <tdeaction.h> #include <tdeparts/part.h> @@ -16,28 +16,28 @@ #include <tdetexteditor/editinterface.h> #include <tdemessagebox.h> -#include "tdevcore.h" -#include "tdevmainwindow.h" -#include "tdevlanguagesupport.h" -#include "tdevpartcontroller.h" -#include "tdevproject.h" +#include "kdevcore.h" +#include "kdevmainwindow.h" +#include "kdevlanguagesupport.h" +#include "kdevpartcontroller.h" +#include "kdevproject.h" #include "codemodel.h" -#include "tdevplugininfo.h" +#include "kdevplugininfo.h" #include "sqlconfigwidget.h" #include "sqlactions.h" #include "sqloutputwidget.h" #include "domutil.h" -typedef TDevGenericFactory<SQLSupportPart> SQLSupportFactory; -static const TDevPluginInfo data("tdevsqlsupport"); -K_EXPORT_COMPONENT_FACTORY( libtdevsqlsupport, SQLSupportFactory( data ) ) +typedef KDevGenericFactory<SQLSupportPart> SQLSupportFactory; +static const KDevPluginInfo data("kdevsqlsupport"); +K_EXPORT_COMPONENT_FACTORY( libkdevsqlsupport, SQLSupportFactory( data ) ) SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStringList& ) - : TDevLanguageSupport ( &data, parent, name ? name : "SQLSupportPart" ) + : KDevLanguageSupport ( &data, parent, name ? name : "SQLSupportPart" ) { setInstance( SQLSupportFactory::instance() ); - setXMLFile( "tdevsqlsupport.rc" ); + setXMLFile( "kdevsqlsupport.rc" ); TDEAction *action; action = new TDEAction( i18n( "&Run" ), "exec", Key_F9, this, TQT_SLOT( slotRun() ), actionCollection(), "build_execute" ); @@ -106,7 +106,7 @@ void SQLSupportPart::loadConfig() int i = 0; TQString conName; while ( true ) { - TQStringList sdb = DomUtil::readListEntry( *doc, "tdevsqlsupport/servers/server" + TQString::number( i ), "el" ); + TQStringList sdb = DomUtil::readListEntry( *doc, "kdevsqlsupport/servers/server" + TQString::number( i ), "el" ); if ( (int)sdb.size() < 6 ) break; @@ -267,7 +267,7 @@ void SQLSupportPart::savedFile( const KURL &fileName ) } } -TDevLanguageSupport::Features SQLSupportPart::features() +KDevLanguageSupport::Features SQLSupportPart::features() { return Features( Classes | Functions ); } diff --git a/languages/sql/sqlsupport_part.h b/languages/sql/sqlsupport_part.h index 4798d7fa..d5efca5b 100644 --- a/languages/sql/sqlsupport_part.h +++ b/languages/sql/sqlsupport_part.h @@ -1,5 +1,5 @@ -#ifndef __TDEVPART_SQLSUPPORT_H__ -#define __TDEVPART_SQLSUPPORT_H__ +#ifndef __KDEVPART_SQLSUPPORT_H__ +#define __KDEVPART_SQLSUPPORT_H__ #include <tqguardedptr.h> #include <tqstringlist.h> @@ -7,14 +7,14 @@ #include <kprocess.h> #include <kdialogbase.h> -#include "tdevplugin.h" -#include "tdevlanguagesupport.h" +#include "kdevplugin.h" +#include "kdevlanguagesupport.h" class SqlListAction; class SqlOutputWidget; class CodeModel; -class SQLSupportPart : public TDevLanguageSupport +class SQLSupportPart : public KDevLanguageSupport { Q_OBJECT |