From c6cb3f27942501d24b0ded69c90ebbf7c43c755e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Sep 2013 20:02:30 +0200 Subject: Additional k => tde renaming and fixes --- tdeparts/COMMENTS | 2 +- tdeparts/Mainpage.dox | 2 +- tdeparts/Makefile.am | 4 ++-- tdeparts/browserextension.h | 16 ++++++++-------- tdeparts/browserinterface.h | 2 +- tdeparts/browserrun.cpp | 2 +- tdeparts/browserrun.h | 2 +- tdeparts/dockmainwindow.h | 2 +- tdeparts/event.cpp | 6 +++--- tdeparts/event.h | 8 ++++---- tdeparts/factory.h | 2 +- tdeparts/historyprovider.h | 2 +- tdeparts/mainwindow.h | 2 +- tdeparts/part.h | 12 ++++++------ tdeparts/partmanager.h | 2 +- tdeparts/plugin.h | 2 +- tdeparts/statusbarextension.h | 8 ++++---- tdeparts/tests/Makefile.am | 12 ++++++------ 18 files changed, 44 insertions(+), 44 deletions(-) (limited to 'tdeparts') diff --git a/tdeparts/COMMENTS b/tdeparts/COMMENTS index 7d17ebdc0..cd65e2db9 100644 --- a/tdeparts/COMMENTS +++ b/tdeparts/COMMENTS @@ -258,7 +258,7 @@ changes. weis: you should have come before. coolo is talking about re-writing libtdeio. well in fact he started the rewrite dfaure having a look - dfaure: Unfortunately I am not paid for KDE but for Qt hacking :-( So I fear I have no time for kio anyway. + dfaure: Unfortunately I am not paid for KDE but for Qt hacking :-( So I fear I have no time for tdeio anyway. weis: I know that, but perhaps a little discussion would help him with the new design :) dfaure: So you are not convinced by his design ? dfaure: It is about this daemon that forks and loads ioslaves as libs, or ? diff --git a/tdeparts/Mainpage.dox b/tdeparts/Mainpage.dox index 994503d44..2f93a3753 100644 --- a/tdeparts/Mainpage.dox +++ b/tdeparts/Mainpage.dox @@ -37,6 +37,6 @@ Michael Koch \ */ -// DOXYGEN_REFERENCES = tdecore tdeui kio +// DOXYGEN_REFERENCES = tdecore tdeui tdeio // DOXYGEN_SET_PROJECT_NAME = KParts // vim:ts=4:sw=4:expandtab:filetype=doxygen diff --git a/tdeparts/Makefile.am b/tdeparts/Makefile.am index 6796745a9..8a169b5b8 100644 --- a/tdeparts/Makefile.am +++ b/tdeparts/Makefile.am @@ -5,7 +5,7 @@ AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) INCLUDES= -I$(srcdir)/../ -I$(top_srcdir)/tdeio/ -I$(top_srcdir)/libltdl \ -I$(top_srcdir)/tdefile $(all_includes) libtdeparts_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 3:0:1 -no-undefined -libtdeparts_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la +libtdeparts_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la check-local: (cd tests && $(MAKE) check ) @@ -28,5 +28,5 @@ libtdeparts_la_METASOURCES = AUTO servicetype_DATA = kpart.desktop krop.desktop krwp.desktop browserview.desktop servicetypedir = $(kde_servicetypesdir) -DOXYGEN_REFERENCES = tdecore tdeui tdefx kio +DOXYGEN_REFERENCES = tdecore tdeui tdefx tdeio include ../admin/Doxyfile.am diff --git a/tdeparts/browserextension.h b/tdeparts/browserextension.h index 8dcbe68f7..a84c3c837 100644 --- a/tdeparts/browserextension.h +++ b/tdeparts/browserextension.h @@ -54,7 +54,7 @@ struct URLArgsPrivate; * This can also be used the other way round, when a part asks * for a URL to be opened (with openURLRequest or createNewWindow). */ -struct KPARTS_EXPORT URLArgs +struct TDEPARTS_EXPORT URLArgs { URLArgs(); URLArgs( const URLArgs &args ); @@ -128,7 +128,7 @@ struct KPARTS_EXPORT URLArgs bool newTab() const; /** - * Meta-data to associate with the next KIO operation + * Meta-data to associate with the next TDEIO operation * @see TDEIO::TransferJob etc. */ TQMap &metaData(); @@ -181,7 +181,7 @@ struct WindowArgsPrivate; * call (see the createNewWindow variant that uses WindowArgs). * The primary reason for this is the javascript window.open function. */ -struct KPARTS_EXPORT WindowArgs +struct TDEPARTS_EXPORT WindowArgs { WindowArgs(); ~WindowArgs(); @@ -218,7 +218,7 @@ struct KPARTS_EXPORT WindowArgs * The event should be sent before opening the URL in the part, so that the plugins * can use part()->url() to get the old URL. */ -class KPARTS_EXPORT OpenURLEvent : public Event +class TDEPARTS_EXPORT OpenURLEvent : public Event { public: OpenURLEvent( ReadOnlyPart *part, const KURL &url, const URLArgs &args = URLArgs() ); @@ -305,7 +305,7 @@ class BrowserExtensionPrivate; * otherwise, they are saved globally. * @li @p disableScrolling: no scrollbars */ -class KPARTS_EXPORT BrowserExtension : public TQObject +class TDEPARTS_EXPORT BrowserExtension : public TQObject { Q_OBJECT TQ_PROPERTY( bool urlDropHandling READ isURLDropHandlingEnabled WRITE setURLDropHandlingEnabled ) @@ -686,7 +686,7 @@ signals: */ void setPageSecurity( int ); -#define KPARTS_BROWSEREXTENSION_HAS_ITEMS_REMOVED +#define TDEPARTS_BROWSEREXTENSION_HAS_ITEMS_REMOVED /** * Inform the host about items that have been removed. * @since 3.5.5 @@ -721,7 +721,7 @@ private: * other parts. * For instance a TDEHTMLPart hosts one part per frame. */ -class KPARTS_EXPORT BrowserHostExtension : public TQObject +class TDEPARTS_EXPORT BrowserHostExtension : public TQObject { Q_OBJECT public: @@ -789,7 +789,7 @@ private: * A part can have an object hierarchie by using objid as a reference * to an object. */ -class KPARTS_EXPORT LiveConnectExtension : public TQObject +class TDEPARTS_EXPORT LiveConnectExtension : public TQObject { Q_OBJECT public: diff --git a/tdeparts/browserinterface.h b/tdeparts/browserinterface.h index 82521376f..5934c2c9c 100644 --- a/tdeparts/browserinterface.h +++ b/tdeparts/browserinterface.h @@ -35,7 +35,7 @@ namespace KParts * * */ -class KPARTS_EXPORT BrowserInterface : public TQObject +class TDEPARTS_EXPORT BrowserInterface : public TQObject { Q_OBJECT public: diff --git a/tdeparts/browserrun.cpp b/tdeparts/browserrun.cpp index 3abd01524..0d3ace26c 100644 --- a/tdeparts/browserrun.cpp +++ b/tdeparts/browserrun.cpp @@ -467,7 +467,7 @@ void BrowserRun::redirectToError( int error, const TQString& errorText ) * * The format of the error:/ URL is error:/?query#url, * where two variables are passed in the query: - * error = int kio error code, errText = TQString error text from kio + * error = int tdeio error code, errText = TQString error text from tdeio * The sub-url is the URL that we were trying to open. */ KURL newURL(TQString("error:/?error=%1&errText=%2") diff --git a/tdeparts/browserrun.h b/tdeparts/browserrun.h index f84e088b3..0b7e1f514 100644 --- a/tdeparts/browserrun.h +++ b/tdeparts/browserrun.h @@ -39,7 +39,7 @@ namespace KParts { * * @author David Faure */ - class KPARTS_EXPORT BrowserRun : public KRun + class TDEPARTS_EXPORT BrowserRun : public KRun { Q_OBJECT public: diff --git a/tdeparts/dockmainwindow.h b/tdeparts/dockmainwindow.h index 5f9209092..4974390de 100644 --- a/tdeparts/dockmainwindow.h +++ b/tdeparts/dockmainwindow.h @@ -44,7 +44,7 @@ class DockMainWindowPrivate; * It implements all internal interfaces in the case of a KDockMainWindow as host: * the builder and servant interface (for menu merging). */ -class KPARTS_EXPORT DockMainWindow : public KDockMainWindow, virtual public PartBase +class TDEPARTS_EXPORT DockMainWindow : public KDockMainWindow, virtual public PartBase { Q_OBJECT public: diff --git a/tdeparts/event.cpp b/tdeparts/event.cpp index a25d61640..dd7aefa8c 100644 --- a/tdeparts/event.cpp +++ b/tdeparts/event.cpp @@ -22,10 +22,10 @@ using namespace KParts; //the answer! -#define KPARTS_EVENT_MAGIC 42 +#define TDEPARTS_EVENT_MAGIC 42 Event::Event( const char *eventName ) - : TQCustomEvent( (TQEvent::Type)(TQEvent::User + KPARTS_EVENT_MAGIC), (void *)eventName ) + : TQCustomEvent( (TQEvent::Type)(TQEvent::User + TDEPARTS_EVENT_MAGIC), (void *)eventName ) { } @@ -42,7 +42,7 @@ bool Event::test( const TQEvent *event ) if ( !event ) return false; - return ( event->type() == (TQEvent::Type)(TQEvent::User + KPARTS_EVENT_MAGIC ) ); + return ( event->type() == (TQEvent::Type)(TQEvent::User + TDEPARTS_EVENT_MAGIC ) ); } bool Event::test( const TQEvent *event, const char *name ) diff --git a/tdeparts/event.h b/tdeparts/event.h index 65f1c7be9..dd98629b0 100644 --- a/tdeparts/event.h +++ b/tdeparts/event.h @@ -33,7 +33,7 @@ class Part; /** * Base class for all KParts events. */ -class KPARTS_EXPORT Event : public TQCustomEvent +class TDEPARTS_EXPORT Event : public TQCustomEvent { public: Event( const char *eventName ); @@ -51,7 +51,7 @@ public: * only for parts that have GUI elements, and only if using KParts::MainWindow. * @see KParts::Part::guiActivateEvent() */ -class KPARTS_EXPORT GUIActivateEvent : public Event +class TDEPARTS_EXPORT GUIActivateEvent : public Event { public: GUIActivateEvent( bool activated ) : Event( s_strGUIActivateEvent ), m_bActivated( activated ) {} @@ -73,7 +73,7 @@ private: * with activated=true, part=newPart, widget=newWidget. * @see KParts::Part::partActivateEvent */ -class KPARTS_EXPORT PartActivateEvent : public Event +class TDEPARTS_EXPORT PartActivateEvent : public Event { public: PartActivateEvent( bool activated, Part *part, TQWidget *widget ) : Event( s_strPartActivateEvent ), m_bActivated( activated ), m_part( part ), m_widget( widget ) {} @@ -96,7 +96,7 @@ private: * This event is sent when a part is selected or deselected. * @see KParts::PartManager::setSelectionPolicy */ -class KPARTS_EXPORT PartSelectEvent : public Event +class TDEPARTS_EXPORT PartSelectEvent : public Event { public: PartSelectEvent( bool selected, Part *part, TQWidget *widget ) : Event( s_strPartSelectEvent ), m_bSelected( selected ), m_part( part ), m_widget( widget ) {} diff --git a/tdeparts/factory.h b/tdeparts/factory.h index 3a6f3e4ed..cdce3bbf4 100644 --- a/tdeparts/factory.h +++ b/tdeparts/factory.h @@ -37,7 +37,7 @@ class Part; * * @see KLibFactory. */ -class KPARTS_EXPORT Factory : public KLibFactory +class TDEPARTS_EXPORT Factory : public KLibFactory { Q_OBJECT public: diff --git a/tdeparts/historyprovider.h b/tdeparts/historyprovider.h index 1123981ec..616668e99 100644 --- a/tdeparts/historyprovider.h +++ b/tdeparts/historyprovider.h @@ -38,7 +38,7 @@ namespace KParts { * * @author Carsten Pfeiffer */ -class KPARTS_EXPORT HistoryProvider : public TQObject +class TDEPARTS_EXPORT HistoryProvider : public TQObject { Q_OBJECT diff --git a/tdeparts/mainwindow.h b/tdeparts/mainwindow.h index 5872ae9c2..f39c9f7c0 100644 --- a/tdeparts/mainwindow.h +++ b/tdeparts/mainwindow.h @@ -44,7 +44,7 @@ class MainWindowPrivate; * TDEMainWindow as host: the builder and servant interface (for menu * merging). */ -class KPARTS_EXPORT MainWindow : public TDEMainWindow, virtual public PartBase +class TDEPARTS_EXPORT MainWindow : public TDEMainWindow, virtual public PartBase { Q_OBJECT public: diff --git a/tdeparts/part.h b/tdeparts/part.h index 7550bce38..90c1804c5 100644 --- a/tdeparts/part.h +++ b/tdeparts/part.h @@ -54,7 +54,7 @@ class PartBasePrivate; * * @short Base class for all parts. */ -class KPARTS_EXPORT PartBase : virtual public KXMLGUIClient +class TDEPARTS_EXPORT PartBase : virtual public KXMLGUIClient { friend class PartBasePrivate; public: @@ -178,7 +178,7 @@ private: * framework for a "viewer" part and for an "editor"-like part. * Use Part directly only if your part doesn't fit into those. */ -class KPARTS_EXPORT Part : public TQObject, public PartBase +class TDEPARTS_EXPORT Part : public TQObject, public PartBase { Q_OBJECT @@ -335,7 +335,7 @@ class ReadOnlyPartPrivate; * If you want another caption, set it in openFile() and * (if the part might ever be used with a part manager) in guiActivateEvent() */ -class KPARTS_EXPORT ReadOnlyPart : public Part +class TDEPARTS_EXPORT ReadOnlyPart : public Part { Q_OBJECT friend class ReadWritePart; @@ -353,7 +353,7 @@ public: /** * Call this to turn off the progress info dialog used by - * the internal KIO job. Use this if you provide another way + * the internal TDEIO job. Use this if you provide another way * of displaying progress info (e.g. a statusbar), using the * signals emitted by this class, and/or those emitted by * the Job given by started. @@ -362,7 +362,7 @@ public: /** * Returns whether the part shows the progress info dialog used by internal - * KIO job. + * TDEIO job. */ bool isProgressInfoEnabled() const; @@ -541,7 +541,7 @@ private: * The part probably wants to reimplement setReadWrite, disable those * actions. Don't forget to call the parent setReadWrite(). */ -class KPARTS_EXPORT ReadWritePart : public ReadOnlyPart +class TDEPARTS_EXPORT ReadWritePart : public ReadOnlyPart { Q_OBJECT public: diff --git a/tdeparts/partmanager.h b/tdeparts/partmanager.h index 1d9e0da84..83165f84a 100644 --- a/tdeparts/partmanager.h +++ b/tdeparts/partmanager.h @@ -47,7 +47,7 @@ class PartManagerPrivate; * Parts know about the part manager to add nested parts to it. * See also KParts::Part::manager() and KParts::Part::setManager(). */ -class KPARTS_EXPORT PartManager : public TQObject +class TDEPARTS_EXPORT PartManager : public TQObject { Q_OBJECT TQ_ENUMS( SelectionPolicy ) diff --git a/tdeparts/plugin.h b/tdeparts/plugin.h index 751ee9c99..6815e9f02 100644 --- a/tdeparts/plugin.h +++ b/tdeparts/plugin.h @@ -46,7 +46,7 @@ namespace KParts * You should also install a "plugin info" .desktop file with the same name. * \see PluginInfo */ -class KPARTS_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient +class TDEPARTS_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient { Q_OBJECT public: diff --git a/tdeparts/statusbarextension.h b/tdeparts/statusbarextension.h index 8e6ea062d..28b3b825b 100644 --- a/tdeparts/statusbarextension.h +++ b/tdeparts/statusbarextension.h @@ -18,8 +18,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef KPARTS_STATUSBAREXTENSION_H -#define KPARTS_STATUSBAREXTENSION_H +#ifndef TDEPARTS_STATUSBAREXTENSION_H +#define TDEPARTS_STATUSBAREXTENSION_H #include #include @@ -50,7 +50,7 @@ namespace KParts * * @since 3.2 */ - class KPARTS_EXPORT StatusBarExtension : public TQObject + class TDEPARTS_EXPORT StatusBarExtension : public TQObject { Q_OBJECT @@ -121,6 +121,6 @@ namespace KParts }; } -#endif // KPARTS_STATUSBAREXTENSION_H +#endif // TDEPARTS_STATUSBAREXTENSION_H // vim: ts=2 sw=2 et diff --git a/tdeparts/tests/Makefile.am b/tdeparts/tests/Makefile.am index 0e77c3e4c..edaf472c1 100644 --- a/tdeparts/tests/Makefile.am +++ b/tdeparts/tests/Makefile.am @@ -1,27 +1,27 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/tdefile -I$(top_srcdir)/tdeio $(all_includes) AM_LDFLAGS = $(all_libraries) -LDADD = $(LIB_KPARTS) +LDADD = $(LIB_TDEPARTS) check_PROGRAMS = tdepartstest normalktmtest ghostviewtest tdepartstest_SOURCES = example.cpp parts.cpp -tdepartstest_LDADD = libnotepad.la $(LIB_KPARTS) +tdepartstest_LDADD = libnotepad.la $(LIB_TDEPARTS) normalktmtest_SOURCES = normalktm.cpp parts.cpp -normalktmtest_LDADD = libnotepad.la $(LIB_KPARTS) +normalktmtest_LDADD = libnotepad.la $(LIB_TDEPARTS) ghostviewtest_SOURCES = ghostview.cpp -ghostviewtest_LDADD = $(LIB_KPARTS) +ghostviewtest_LDADD = $(LIB_TDEPARTS) # These are not really libraries, but modules dynamically opened. # So they should be installed in kde_module_dir, which is usually $prefix/lib/trinity kde_module_LTLIBRARIES = libspellcheckplugin.la libnotepadpart.la libspellcheckplugin_la_SOURCES = plugin_spellcheck.cpp -libspellcheckplugin_la_LIBADD = $(LIB_KPARTS) +libspellcheckplugin_la_LIBADD = $(LIB_TDEPARTS) libspellcheckplugin_la_LDFLAGS = -module $(KDE_PLUGIN) libnotepadpart_la_SOURCES = notepadpart.cpp -libnotepadpart_la_LIBADD = libnotepad.la $(LIB_KPARTS) +libnotepadpart_la_LIBADD = libnotepad.la $(LIB_TDEPARTS) libnotepadpart_la_LDFLAGS = -module $(KDE_PLUGIN) noinst_LTLIBRARIES = libnotepad.la -- cgit v1.2.1