From 642c256d47aef772f1ca802894dcced70404a81b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 21:04:37 -0600 Subject: [PATCH] Rename kiobuffer and KHTML --- cmake | 2 +- kapptemplate/README | 2 +- kapptemplate/kpartplugin/plugin-Makefile.am | 8 ++++---- kapptemplate/kpartplugin/plugin_app.cpp | 6 +++--- kbugbuster/Makefile.am | 2 +- kbugbuster/gui/README | 2 +- kbugbuster/gui/cwbugdetails.cpp | 2 +- kbugbuster/gui/cwbugdetails.h | 4 ++-- .../{kio_svn_helper.cpp => tdeio_svn_helper.cpp} | 0 .../svnhelper/{kio_svn_helper.h => tdeio_svn_helper.h} | 0 10 files changed, 14 insertions(+), 14 deletions(-) rename tdeioslave/svn/svnhelper/{kio_svn_helper.cpp => tdeio_svn_helper.cpp} (100%) rename tdeioslave/svn/svnhelper/{kio_svn_helper.h => tdeio_svn_helper.h} (100%) diff --git a/cmake b/cmake index 9a217903..274366fb 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 9a217903f9fa35ca12213a6e9ee3d2cb87d1131d +Subproject commit 274366fb8b90704586d7beef216b765cc0688b08 diff --git a/kapptemplate/README b/kapptemplate/README index d48a2a3d..eb20be57 100644 --- a/kapptemplate/README +++ b/kapptemplate/README @@ -23,7 +23,7 @@ Currently, KAppTemplate creates four different types of frameworks: 3) KPart plugin - This creates a sample KPart plugin that acts on KHTMLPart + This creates a sample KPart plugin that acts on TDEHTMLPart 4) Existing application conversion diff --git a/kapptemplate/kpartplugin/plugin-Makefile.am b/kapptemplate/kpartplugin/plugin-Makefile.am index 21b5ccdd..7c01ef75 100644 --- a/kapptemplate/kpartplugin/plugin-Makefile.am +++ b/kapptemplate/kpartplugin/plugin-Makefile.am @@ -8,13 +8,13 @@ KDE_ICON = ${APP_NAME_LC} # Install this plugin in the KDE modules directory kde_module_LTLIBRARIES = lib${APP_NAME_LC}plugin.la -# This is all standard. Remove the LIB_KHTML reference if you are not -# using the KHTML Part +# This is all standard. Remove the LIB_TDEHTML reference if you are not +# using the TDEHTML Part lib${APP_NAME_LC}plugin_la_SOURCES = plugin_${APP_NAME_LC}.cpp -lib${APP_NAME_LC}plugin_la_LIBADD = \$(LIB_KPARTS) \$(LIB_KHTML) +lib${APP_NAME_LC}plugin_la_LIBADD = \$(LIB_KPARTS) \$(LIB_TDEHTML) lib${APP_NAME_LC}plugin_la_LDFLAGS = -module \$(KDE_PLUGIN) \$(all_libraries) # Install the .rc file in the Part's directory (in this case, the part -# is KHTMLPart) +# is TDEHTMLPart) pluginsdir = \$(kde_datadir)/tdehtml/kpartplugins plugins_DATA = plugin_${APP_NAME_LC}.rc diff --git a/kapptemplate/kpartplugin/plugin_app.cpp b/kapptemplate/kpartplugin/plugin_app.cpp index 98a44cad..29388b46 100644 --- a/kapptemplate/kpartplugin/plugin_app.cpp +++ b/kapptemplate/kpartplugin/plugin_app.cpp @@ -30,10 +30,10 @@ Plugin${APP_NAME}::~Plugin${APP_NAME}() void Plugin${APP_NAME}::slotAction() { - // This plugin assumes KHTMLPart. If your plugin can handle more + // This plugin assumes TDEHTMLPart. If your plugin can handle more // than this or a different Part than this, simply delete or // change the following block. - if ( !parent()->inherits("KHTMLPart") ) + if ( !parent()->inherits("TDEHTMLPart") ) { TQString title( i18n( "Cannot Translate Source" ) ); TQString text( i18n( "You cannot translate anything except web pages " @@ -45,7 +45,7 @@ void Plugin${APP_NAME}::slotAction() // Get a handle on our parent so we may get the necessary data for // processing - KHTMLPart *part = dynamic_cast(parent()); + TDEHTMLPart *part = dynamic_cast(parent()); // This plugin only uses the URL. You may use whatever data you // need. diff --git a/kbugbuster/Makefile.am b/kbugbuster/Makefile.am index 727c0b69..f1e6939d 100644 --- a/kbugbuster/Makefile.am +++ b/kbugbuster/Makefile.am @@ -11,7 +11,7 @@ bin_PROGRAMS = kbugbuster kbugbuster_SOURCES = main.cpp kbugbuster_LDADD = -ltdeutils gui/libkbbmainwindow.la \ - backend/libkbbbackend.la $(LIB_KHTML) $(LIB_KIO) -ltdefx $(LIB_KUTILS) + backend/libkbbbackend.la $(LIB_TDEHTML) $(LIB_KIO) -ltdefx $(LIB_KUTILS) kbugbuster_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KUTILS) xdg_apps_DATA = kbugbuster.desktop diff --git a/kbugbuster/gui/README b/kbugbuster/gui/README index 54e5fa67..6f28720f 100644 --- a/kbugbuster/gui/README +++ b/kbugbuster/gui/README @@ -15,7 +15,7 @@ Widgets, including a Qt designer .ui file: centralwidget* The main widget of kbbmainwindow cwbuglistcontainer* The widget containing the bug list (top of central widget) cwbugdetailscontainer* The widget containing the bug details + the buttons in its right (bottom of central widget). -cwbugdetails* The widget showing details of a bug report, using KHTMLPart +cwbugdetails* The widget showing details of a bug report, using TDEHTMLPart cwsearchwidget* A future search widget on the left of the bug details. Same functionality is in the menus, this would take too much screen space IMHO (DF) preferencesdialog* Preferences dialog diff --git a/kbugbuster/gui/cwbugdetails.cpp b/kbugbuster/gui/cwbugdetails.cpp index 0ab78ff2..1c6fa6c5 100644 --- a/kbugbuster/gui/cwbugdetails.cpp +++ b/kbugbuster/gui/cwbugdetails.cpp @@ -40,7 +40,7 @@ CWBugDetails::CWBugDetails( TQWidget *parent , const char * name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); - m_bugDesc = new KHTMLPart( this, "m_bugDesc" ); + m_bugDesc = new TDEHTMLPart( this, "m_bugDesc" ); connect( m_bugDesc->browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), this, TQT_SLOT( handleOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); diff --git a/kbugbuster/gui/cwbugdetails.h b/kbugbuster/gui/cwbugdetails.h index 5067b953..e6388f2f 100644 --- a/kbugbuster/gui/cwbugdetails.h +++ b/kbugbuster/gui/cwbugdetails.h @@ -24,7 +24,7 @@ #include -class KHTMLPart; +class TDEHTMLPart; namespace KBugBusterMainWindow { @@ -53,7 +53,7 @@ class CWBugDetails : public TQWidget TQString textBugDetailsAttribute( const TQString &value, const TQString &name ); - KHTMLPart *m_bugDesc; + TDEHTMLPart *m_bugDesc; TQString mSource; }; diff --git a/tdeioslave/svn/svnhelper/kio_svn_helper.cpp b/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp similarity index 100% rename from tdeioslave/svn/svnhelper/kio_svn_helper.cpp rename to tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp diff --git a/tdeioslave/svn/svnhelper/kio_svn_helper.h b/tdeioslave/svn/svnhelper/tdeio_svn_helper.h similarity index 100% rename from tdeioslave/svn/svnhelper/kio_svn_helper.h rename to tdeioslave/svn/svnhelper/tdeio_svn_helper.h