diff options
| author | Slávek Banko <[email protected]> | 2013-09-03 20:02:20 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2013-09-03 20:59:52 +0200 |
| commit | 78cc506bbab7c8fc2f8b4f6cb183b4ab157b762b (patch) | |
| tree | 073fd8dfc96771e4fc8f8bff5b97fccbf9f7f91c /kmrml | |
| parent | 580e97ebe258cc3c6745aa49fbc6a423de32c9ba (diff) | |
| download | tdegraphics-78cc506bbab7c8fc2f8b4f6cb183b4ab157b762b.tar.gz tdegraphics-78cc506bbab7c8fc2f8b4f6cb183b4ab157b762b.zip | |
Additional k => tde renaming and fixes
Diffstat (limited to 'kmrml')
| -rw-r--r-- | kmrml/kmrml/Makefile.am | 4 | ||||
| -rw-r--r-- | kmrml/kmrml/kcontrol/Makefile.am | 2 | ||||
| -rw-r--r-- | kmrml/kmrml/lib/kmrml_config.cpp | 2 | ||||
| -rw-r--r-- | kmrml/kmrml/mrml_view.cpp | 2 | ||||
| -rw-r--r-- | kmrml/kmrml/server/Makefile.am | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/kmrml/kmrml/Makefile.am b/kmrml/kmrml/Makefile.am index d1e2d8a2..58af2513 100644 --- a/kmrml/kmrml/Makefile.am +++ b/kmrml/kmrml/Makefile.am @@ -9,13 +9,13 @@ LIB_KMRMLSTUFF = $(top_builddir)/kmrml/kmrml/lib/libkmrmlstuff.la kde_module_LTLIBRARIES = tdeio_mrml.la libkmrmlpart.la tdeio_mrml_la_SOURCES = mrml.cpp -tdeio_mrml_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_KIO) +tdeio_mrml_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_TDEIO) tdeio_mrml_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module libkmrmlpart_la_SOURCES = mrml_part.cpp mrml_view.cpp loader.cpp \ mrml_elements.cpp mrml_creator.cpp browser.cpp algorithmdialog.cpp \ collectioncombo.cpp algorithmcombo.cpp propertysheet.cpp -libkmrmlpart_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_KPARTS) +libkmrmlpart_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_TDEPARTS) libkmrmlpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) services_DATA = mrml.protocol mrml_part.desktop diff --git a/kmrml/kmrml/kcontrol/Makefile.am b/kmrml/kmrml/kcontrol/Makefile.am index 68a44912..60637449 100644 --- a/kmrml/kmrml/kcontrol/Makefile.am +++ b/kmrml/kmrml/kcontrol/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_kmrml.la kcm_kmrml_la_SOURCES = kcmkmrml.cpp mainpage.cpp indexer.cpp serverconfigwidget.ui indexcleaner.cpp kcm_kmrml_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_kmrml_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_KIO) +kcm_kmrml_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_TDEIO) INCLUDES= -I$(top_srcdir)/kmrml/kmrml/lib $(all_includes) kcm_kmrml_la_METASOURCES = AUTO diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp index 912658fd..9f5872b9 100644 --- a/kmrml/kmrml/lib/kmrml_config.cpp +++ b/kmrml/kmrml/lib/kmrml_config.cpp @@ -94,7 +94,7 @@ bool Config::sync() return notifySlaves; // This moved to kcontrol/MainPage::save() so we don't have to link against - // KIO and need a full TDEApplication instance to work (so that the tiny + // TDEIO and need a full TDEApplication instance to work (so that the tiny // mrmlsearch binary can also use this class) // tell the ioslaves about the new configuration // if ( notifySlaves ) diff --git a/kmrml/kmrml/mrml_view.cpp b/kmrml/kmrml/mrml_view.cpp index 07c4ac46..0f55670f 100644 --- a/kmrml/kmrml/mrml_view.cpp +++ b/kmrml/kmrml/mrml_view.cpp @@ -132,7 +132,7 @@ TQPixmap * MrmlView::getPixmap( const KURL& url ) m_pixmapCache.insert( u, p ); return m_pixmapCache.find( u ); } - else { // remote url, download with KIO + else { // remote url, download with TDEIO Loader::self()->requestDownload( url ); } diff --git a/kmrml/kmrml/server/Makefile.am b/kmrml/kmrml/server/Makefile.am index 4336a32a..318e8e7f 100644 --- a/kmrml/kmrml/server/Makefile.am +++ b/kmrml/kmrml/server/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = $(all_includes) kded_daemonwatcher_la_SOURCES = watcher.cpp watcher.skel # watcher.stub kded_daemonwatcher_la_LDFLAGS = $(all_libraries) -module -avoid-version -kded_daemonwatcher_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI) +kded_daemonwatcher_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEUI) METASOURCES = AUTO |