From 89ea60adb508a836c4c7d761756db3704035c36e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 21:01:00 -0600 Subject: Rename kiobuffer and KHTML --- ChangeLog | 2 +- acinclude.m4 | 4 ++-- cmake | 2 +- kipi-plugins/ChangeLog | 2 +- kipi-plugins/flickrexport/flickrwidget.cpp | 2 +- kipi-plugins/flickrexport/flickrwidget.h | 4 ++-- kipi-plugins/flickrexport/flickrwindow.h | 4 ++-- kipi-plugins/galleryexport/Makefile.am | 2 +- kipi-plugins/galleryexport/gallerywidget.cpp | 2 +- kipi-plugins/galleryexport/gallerywidget.h | 4 ++-- kipi-plugins/galleryexport/gallerywindow.h | 4 ++-- kipi-plugins/gpssync/Makefile.am | 2 +- kipi-plugins/gpssync/gpsmapwidget.cpp | 6 +++--- kipi-plugins/gpssync/gpsmapwidget.h | 2 +- kipi-plugins/picasawebexport/picasawebwidget.h | 4 ++-- kipi-plugins/picasawebexport/picasawebwindow.h | 4 ++-- kipi-plugins/sync/Makefile.am | 2 +- kipi-plugins/sync/gallerywidget.cpp | 2 +- kipi-plugins/sync/gallerywidget.h | 4 ++-- kipi-plugins/sync/gallerywindow.h | 4 ++-- 20 files changed, 31 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index 48b50d4..aaff71f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9403,7 +9403,7 @@ v 0.1.3-beta1 - 2006-11-29 * [r588865] gpssync/Makefile.am, gpssync/gpseditdialog.cpp, gpssync/gpseditdialog.h, gpssync/gpssyncdialog.cpp: - kipi-plugins from trunk : GPSSync tool : use a KHTMLPart widget + kipi-plugins from trunk : GPSSync tool : use a TDEHTMLPart widget to embed web locator page in GPS positions editor dialog CCMAIL: gerhard@kulzer.net diff --git a/acinclude.m4 b/acinclude.m4 index 657f827..2413bad 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2099,7 +2099,7 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KABC, "-lkabc") - AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") @@ -2120,7 +2120,7 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") diff --git a/cmake b/cmake index 9a21790..274366f 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 9a217903f9fa35ca12213a6e9ee3d2cb87d1131d +Subproject commit 274366fb8b90704586d7beef216b765cc0688b08 diff --git a/kipi-plugins/ChangeLog b/kipi-plugins/ChangeLog index afc2786..663a744 100644 --- a/kipi-plugins/ChangeLog +++ b/kipi-plugins/ChangeLog @@ -9529,7 +9529,7 @@ v 0.1.3-beta1 - 2006-11-29 * [r588865] gpssync/Makefile.am, gpssync/gpseditdialog.cpp, gpssync/gpseditdialog.h, gpssync/gpssyncdialog.cpp: - kipi-plugins from trunk : GPSSync tool : use a KHTMLPart widget + kipi-plugins from trunk : GPSSync tool : use a TDEHTMLPart widget to embed web locator page in GPS positions editor dialog CCMAIL: gerhard@kulzer.net diff --git a/kipi-plugins/flickrexport/flickrwidget.cpp b/kipi-plugins/flickrexport/flickrwidget.cpp index 7c7525c..1fb6d8c 100644 --- a/kipi-plugins/flickrexport/flickrwidget.cpp +++ b/kipi-plugins/flickrexport/flickrwidget.cpp @@ -69,7 +69,7 @@ FlickrWidget::FlickrWidget(TQWidget* parent, KIPI::Interface *iface) TQVBoxLayout* flickrWidgetLayout = new TQVBoxLayout(this, 5, 5); - m_photoView = 0; //new KHTMLPart(splitter); + m_photoView = 0; //new TDEHTMLPart(splitter); KSeparator *line = new KSeparator(Horizontal, this); m_tab = new KTabWidget(this); KActiveLabel *headerLabel = new KActiveLabel(this); diff --git a/kipi-plugins/flickrexport/flickrwidget.h b/kipi-plugins/flickrexport/flickrwidget.h index ab19ada..f6858ab 100644 --- a/kipi-plugins/flickrexport/flickrwidget.h +++ b/kipi-plugins/flickrexport/flickrwidget.h @@ -35,7 +35,7 @@ class TQRadioButton; class KTabWidget; class KLineEdit; -class KHTMLPart; +class TDEHTMLPart; namespace KIPI { @@ -91,7 +91,7 @@ private: KTabWidget* m_tab; - KHTMLPart* m_photoView; + TDEHTMLPart* m_photoView; ImagesList* m_imglst; diff --git a/kipi-plugins/flickrexport/flickrwindow.h b/kipi-plugins/flickrexport/flickrwindow.h index bbf21dc..509eca5 100644 --- a/kipi-plugins/flickrexport/flickrwindow.h +++ b/kipi-plugins/flickrexport/flickrwindow.h @@ -49,7 +49,7 @@ class TQCheckBox; class TQProgressDialog; class KLineEdit; -class KHTMLPart; +class TDEHTMLPart; class KURL; namespace KIPI @@ -149,7 +149,7 @@ private: TQValueList< TQPair > m_uploadQueue; // KWallet::Wallet *m_wallet; - KHTMLPart *m_photoView; + TDEHTMLPart *m_photoView; KLineEdit *m_tagsLineEdit; diff --git a/kipi-plugins/galleryexport/Makefile.am b/kipi-plugins/galleryexport/Makefile.am index a69cfc2..7c30d18 100644 --- a/kipi-plugins/galleryexport/Makefile.am +++ b/kipi-plugins/galleryexport/Makefile.am @@ -14,7 +14,7 @@ kipiplugin_galleryexport_la_SOURCES = plugin_galleryexport.cpp \ galleryviewitem.cpp kipiplugin_galleryexport_la_LIBADD = $(LIBKEXIV2_LIBS) \ - -ltdewalletclient $(LIB_KHTML) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) + -ltdewalletclient $(LIB_TDEHTML) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) kipiplugin_galleryexport_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins diff --git a/kipi-plugins/galleryexport/gallerywidget.cpp b/kipi-plugins/galleryexport/gallerywidget.cpp index 0770dae..836f93a 100644 --- a/kipi-plugins/galleryexport/gallerywidget.cpp +++ b/kipi-plugins/galleryexport/gallerywidget.cpp @@ -73,7 +73,7 @@ GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl ) // ------------------------------------------------------------------------ - m_photoView = new KHTMLPart( splitter, "m_photoView" ); + m_photoView = new TDEHTMLPart( splitter, "m_photoView" ); // ------------------------------------------------------------------------ diff --git a/kipi-plugins/galleryexport/gallerywidget.h b/kipi-plugins/galleryexport/gallerywidget.h index f24ec00..df03c95 100644 --- a/kipi-plugins/galleryexport/gallerywidget.h +++ b/kipi-plugins/galleryexport/gallerywidget.h @@ -25,7 +25,7 @@ class TQListView; class TQPushButton; class TQSpinBox; class TQCheckBox; -class KHTMLPart; +class TDEHTMLPart; namespace KIPIGalleryExportPlugin { @@ -47,7 +47,7 @@ private slots: private: TQListView* m_albumView; - KHTMLPart* m_photoView; + TDEHTMLPart* m_photoView; TQPushButton* m_newAlbumBtn; TQPushButton* m_addPhotoBtn; TQCheckBox* m_captTitleCheckBox; diff --git a/kipi-plugins/galleryexport/gallerywindow.h b/kipi-plugins/galleryexport/gallerywindow.h index 6c27059..5cf0102 100644 --- a/kipi-plugins/galleryexport/gallerywindow.h +++ b/kipi-plugins/galleryexport/gallerywindow.h @@ -29,7 +29,7 @@ class TQPushButton; class TQSpinBox; class TQCheckBox; class TQProgressDialog; -class KHTMLPart; +class TDEHTMLPart; class KURL; namespace KIPI @@ -63,7 +63,7 @@ public: private: TQListView *m_albumView; - KHTMLPart *m_photoView; + TDEHTMLPart *m_photoView; TQPushButton *m_newAlbumBtn; TQPushButton *m_addPhotoBtn; TQPushButton *m_helpButton; diff --git a/kipi-plugins/gpssync/Makefile.am b/kipi-plugins/gpssync/Makefile.am index 0f1c3fe..3e09a63 100644 --- a/kipi-plugins/gpssync/Makefile.am +++ b/kipi-plugins/gpssync/Makefile.am @@ -14,7 +14,7 @@ kipiplugin_gpssync_la_SOURCES = plugin_gpssync.cpp gpssyncdialog.cpp gpslistview kmlgpsdataparser.cpp # Libs needed by the plugin -kipiplugin_gpssync_la_LIBADD = $(LIBKEXIV2_LIBS) -lkipiplugins $(LIBKIPI_LIBS) $(LIB_KHTML) \ +kipiplugin_gpssync_la_LIBADD = $(LIBKEXIV2_LIBS) -lkipiplugins $(LIBKIPI_LIBS) $(LIB_TDEHTML) \ $(LIB_KPARTS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) \ $(LIB_KFILE) diff --git a/kipi-plugins/gpssync/gpsmapwidget.cpp b/kipi-plugins/gpssync/gpsmapwidget.cpp index bae2070..bfe1d84 100644 --- a/kipi-plugins/gpssync/gpsmapwidget.cpp +++ b/kipi-plugins/gpssync/gpsmapwidget.cpp @@ -55,7 +55,7 @@ public: }; GPSMapWidget::GPSMapWidget(TQWidget* parent) - : KHTMLPart(parent) + : TDEHTMLPart(parent) { d = new GPSMapWidgetPrivate; @@ -131,7 +131,7 @@ void GPSMapWidget::tdehtmlMouseMoveEvent(tdehtml::MouseMoveEvent *e) if (status.startsWith(TQString("(lat:"))) extractGPSPositionfromStatusbar(status); - KHTMLPart::tdehtmlMouseMoveEvent(e); + TDEHTMLPart::tdehtmlMouseMoveEvent(e); } void GPSMapWidget::tdehtmlMouseReleaseEvent(tdehtml::MouseReleaseEvent *e) @@ -159,7 +159,7 @@ void GPSMapWidget::tdehtmlMouseReleaseEvent(tdehtml::MouseReleaseEvent *e) d->mapType = status; } - KHTMLPart::tdehtmlMouseReleaseEvent(e); + TDEHTMLPart::tdehtmlMouseReleaseEvent(e); } void GPSMapWidget::resized() diff --git a/kipi-plugins/gpssync/gpsmapwidget.h b/kipi-plugins/gpssync/gpsmapwidget.h index 9030acf..8af923c 100644 --- a/kipi-plugins/gpssync/gpsmapwidget.h +++ b/kipi-plugins/gpssync/gpsmapwidget.h @@ -37,7 +37,7 @@ namespace KIPIGPSSyncPlugin class GPSMapWidgetPrivate; -class GPSMapWidget : public KHTMLPart +class GPSMapWidget : public TDEHTMLPart { Q_OBJECT diff --git a/kipi-plugins/picasawebexport/picasawebwidget.h b/kipi-plugins/picasawebexport/picasawebwidget.h index f794111..0b30a20 100644 --- a/kipi-plugins/picasawebexport/picasawebwidget.h +++ b/kipi-plugins/picasawebexport/picasawebwidget.h @@ -38,7 +38,7 @@ class TQCheckBox; class TQLineEdit; class TQRadioButton; -class KHTMLPart; +class TDEHTMLPart; namespace KIPIPicasawebExportPlugin { @@ -69,7 +69,7 @@ private: // TQCheckBox* m_resizeCheckBox; // TQCheckBox* m_exportApplicationTags; - KHTMLPart* m_photoView; + TDEHTMLPart* m_photoView; friend class PicasawebWindow; }; diff --git a/kipi-plugins/picasawebexport/picasawebwindow.h b/kipi-plugins/picasawebexport/picasawebwindow.h index a4f1cef..0157cdd 100644 --- a/kipi-plugins/picasawebexport/picasawebwindow.h +++ b/kipi-plugins/picasawebexport/picasawebwindow.h @@ -49,7 +49,7 @@ class TQRadioButton; class TQSpinBox; class TQCheckBox; class TQProgressDialog; -class KHTMLPart; +class TDEHTMLPart; class KURL; class TQLineEdit; class TQComboBox; @@ -123,7 +123,7 @@ private: // KWallet::Wallet *m_wallet; - KHTMLPart *m_photoView; + TDEHTMLPart *m_photoView; KURL::List *m_urls; PicasawebWidget *m_widget; diff --git a/kipi-plugins/sync/Makefile.am b/kipi-plugins/sync/Makefile.am index 91f7e5f..ededf9a 100644 --- a/kipi-plugins/sync/Makefile.am +++ b/kipi-plugins/sync/Makefile.am @@ -16,7 +16,7 @@ kipiplugin_sync_la_SOURCES = plugin_sync.cpp \ sinks/gallery/gallerycollection.cpp sinks/gallery/galleryitem.cpp kipiplugin_sync_la_LIBADD = $(LIBKEXIV2_LIBS) \ - -ltdewalletclient $(LIB_KHTML) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) + -ltdewalletclient $(LIB_TDEHTML) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) kipiplugin_sync_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins diff --git a/kipi-plugins/sync/gallerywidget.cpp b/kipi-plugins/sync/gallerywidget.cpp index c31db8d..6b6d0b7 100644 --- a/kipi-plugins/sync/gallerywidget.cpp +++ b/kipi-plugins/sync/gallerywidget.cpp @@ -73,7 +73,7 @@ GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl ) // ------------------------------------------------------------------------ - m_photoView = new KHTMLPart( splitter, "m_photoView" ); + m_photoView = new TDEHTMLPart( splitter, "m_photoView" ); // ------------------------------------------------------------------------ diff --git a/kipi-plugins/sync/gallerywidget.h b/kipi-plugins/sync/gallerywidget.h index 3d7edd4..8d621d9 100644 --- a/kipi-plugins/sync/gallerywidget.h +++ b/kipi-plugins/sync/gallerywidget.h @@ -25,7 +25,7 @@ class TQListView; class TQPushButton; class TQSpinBox; class TQCheckBox; -class KHTMLPart; +class TDEHTMLPart; namespace KIPIGalleryExportPlugin { @@ -47,7 +47,7 @@ private slots: private: TQListView* m_albumView; - KHTMLPart* m_photoView; + TDEHTMLPart* m_photoView; TQPushButton* m_newAlbumBtn; TQPushButton* m_addPhotoBtn; TQCheckBox* m_resizeCheckBox; diff --git a/kipi-plugins/sync/gallerywindow.h b/kipi-plugins/sync/gallerywindow.h index 5e075e7..38cf3d0 100644 --- a/kipi-plugins/sync/gallerywindow.h +++ b/kipi-plugins/sync/gallerywindow.h @@ -29,7 +29,7 @@ class TQPushButton; class TQSpinBox; class TQCheckBox; class TQProgressDialog; -class KHTMLPart; +class TDEHTMLPart; class KURL; namespace KIPI @@ -63,7 +63,7 @@ public: private: TQListView *m_albumView; - KHTMLPart *m_photoView; + TDEHTMLPart *m_photoView; TQPushButton *m_newAlbumBtn; TQPushButton *m_addPhotoBtn; TQPushButton *m_helpButton; -- cgit v1.2.3