From 9018d91bdfa16257f2d3272e4d4d674633edbb95 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 20:54:29 -0600 Subject: [PATCH] Rename kiobuffer and KHTML --- ChangeLog | 2 +- acinclude.m4 | 4 ++-- amarok/src/Makefile.am | 2 +- amarok/src/contextbrowser.cpp | 6 +++--- amarok/src/htmlview.cpp | 12 ++++++------ amarok/src/htmlview.h | 2 +- amarok/src/konquisidebar/Makefile.am | 2 +- amarok/src/konquisidebar/universalamarok.cpp | 4 ++-- amarok/src/konquisidebar/universalamarok.h | 2 +- .../src/magnatunebrowser/magnatuneartistinfobox.cpp | 2 +- amarok/src/magnatunebrowser/magnatuneartistinfobox.h | 4 ++-- amarok/src/playlistbrowser.cpp | 4 ++-- amarok/src/tagdialog.cpp | 2 +- amarok/src/tagdialog.h | 2 +- cmake | 2 +- 15 files changed, 26 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0acb004c..f25be08d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1960,7 +1960,7 @@ VERSION 1.2.3: * "Remove Duplicates / Missing" fixed. Removes dead entries correctly. * Fix units for samplerate. (BR 101528) * amaroK using 100% CPU on some systems. (BR 101524) - (a KHTML bug which got exposed by code in amaroK 1.2.2) + (a TDEHTML bug which got exposed by code in amaroK 1.2.2) VERSION 1.2.2: diff --git a/acinclude.m4 b/acinclude.m4 index 5d618731..4b734688 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/amarok/src/Makefile.am b/amarok/src/Makefile.am index 2a759d22..47b2ba0a 100644 --- a/amarok/src/Makefile.am +++ b/amarok/src/Makefile.am @@ -158,7 +158,7 @@ libamarok_la_LIBADD = \ $(top_builddir)/amarok/src/statusbar/libstatusbar.la \ $(top_builddir)/amarok/src/metadata/libmetadata.la \ $(top_builddir)/amarok/src/magnatunebrowser/libmagnatunebrowser.la \ - $(LIB_QT) $(LIB_KPARTS) -lDCOP -ltdefx $(KDE_MT_LIBS) $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KHTML) $(LIB_KNEWSTUFF) \ + $(LIB_QT) $(LIB_KPARTS) -lDCOP -ltdefx $(KDE_MT_LIBS) $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEHTML) $(LIB_KNEWSTUFF) \ $(TAGLIB_LIBS) $(gl_libs) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) \ $(LIB_TUNEPIMP) \ $(mysql_libs) \ diff --git a/amarok/src/contextbrowser.cpp b/amarok/src/contextbrowser.cpp index 394b2589..9e434496 100644 --- a/amarok/src/contextbrowser.cpp +++ b/amarok/src/contextbrowser.cpp @@ -147,7 +147,7 @@ namespace Amarok void albumArtistTrackFromUrl( TQString url, TQString &artist, TQString &album, TQString &detail ) { if ( !url.contains("@@@") ) return; - //KHTML removes the trailing space! + //TDEHTML removes the trailing space! if ( url.endsWith( " @@@" ) ) url += ' '; @@ -392,8 +392,8 @@ ContextBrowser::~ContextBrowser() ThreadManager::instance()->abortAllJobsNamed( "CurrentTrackJob" ); - // Ensure the KHTMLPart dies before its KHTMLView dies, - // because KHTMLPart's dtoring relies on its KHTMLView still being alive + // Ensure the TDEHTMLPart dies before its TDEHTMLView dies, + // because TDEHTMLPart's dtoring relies on its TDEHTMLView still being alive // (see bug 130494). delete m_currentTrackPage; delete m_lyricsPage; diff --git a/amarok/src/htmlview.cpp b/amarok/src/htmlview.cpp index 382cafcc..47876403 100644 --- a/amarok/src/htmlview.cpp +++ b/amarok/src/htmlview.cpp @@ -28,7 +28,7 @@ KTempFile *HTMLView::m_shadowGradientImage = 0; int HTMLView::m_instances = 0; HTMLView::HTMLView( TQWidget *parentWidget, const char *widgetname, const bool DNDEnabled, const bool JScriptEnabled ) - : KHTMLPart( parentWidget, widgetname ) + : TDEHTMLPart( parentWidget, widgetname ) { m_instances++; setJavaEnabled( false ); @@ -74,7 +74,7 @@ HTMLView::enableCopyAction() void HTMLView::selectAll() { - KHTMLPart::selectAll(); + TDEHTMLPart::selectAll(); } void @@ -120,8 +120,8 @@ HTMLView::loadStyleSheet() const TQColor bgColor = ContextBrowser::instance()->colorGroup().highlight(); TQColor gradientColor = bgColor; - //we have to set the color for body due to a KHTML bug - //KHTML sets the base color but not the text color + //we have to set the color for body due to a TDEHTML bug + //TDEHTML sets the base color but not the text color styleSheet = TQString( "body { margin: 8px; font-size: %1px; color: %2; background-color: %3; font-family: %4; }" ) .arg( pxSize ) .arg( text ) @@ -185,8 +185,8 @@ HTMLView::loadStyleSheet() m_headerGradientImage->setAutoDelete( true ); m_shadowGradientImage->setAutoDelete( true ); - //we have to set the color for body due to a KHTML bug - //KHTML sets the base color but not the text color + //we have to set the color for body due to a TDEHTML bug + //TDEHTML sets the base color but not the text color styleSheet = TQString( "body { margin: 4px; font-size: %1px; color: %2; background-color: %3; background-image: url( %4 ); background-repeat: repeat; font-family: %5; }" ) .arg( pxSize ) .arg( text ) diff --git a/amarok/src/htmlview.h b/amarok/src/htmlview.h index 32592e2d..fb9b8489 100644 --- a/amarok/src/htmlview.h +++ b/amarok/src/htmlview.h @@ -13,7 +13,7 @@ class KAction; class KTempFile; -class HTMLView : public KHTMLPart +class HTMLView : public TDEHTMLPart { Q_OBJECT diff --git a/amarok/src/konquisidebar/Makefile.am b/amarok/src/konquisidebar/Makefile.am index a0f87725..1ec0186a 100644 --- a/amarok/src/konquisidebar/Makefile.am +++ b/amarok/src/konquisidebar/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = konqsidebar_universalamarok.la konqsidebar_universalamarok_la_SOURCES = universalamarok.cpp amarokdcopiface.stub konqsidebar_universalamarok_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkonqsidebarplugin -konqsidebar_universalamarok_la_LIBADD = $(LIB_KHTML) $(LIB_QT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI) +konqsidebar_universalamarok_la_LIBADD = $(LIB_TDEHTML) $(LIB_QT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI) amarokdcopiface_DIR=$(top_srcdir)/amarok/src/amarokcore diff --git a/amarok/src/konquisidebar/universalamarok.cpp b/amarok/src/konquisidebar/universalamarok.cpp index c24beb8f..d4820dfb 100644 --- a/amarok/src/konquisidebar/universalamarok.cpp +++ b/amarok/src/konquisidebar/universalamarok.cpp @@ -88,8 +88,8 @@ UniversalAmarok::UniversalAmarok(TDEInstance *inst,TQObject *parent,TQWidget *wi topBar->insertButton( "document", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( lyrics() ) ); topBar->insertButton( "personal", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( wiki() ) ); - browser = new KHTMLPart(widget, "widget-browser"); -//browser=new KHTMLPart(widget); + browser = new TDEHTMLPart(widget, "widget-browser"); +//browser=new TDEHTMLPart(widget); kdDebug() << "parentPart() << " << browser->parentPart() << endl; browser->setDNDEnabled( true ); browser->setEncoding( "utf8", true ); diff --git a/amarok/src/konquisidebar/universalamarok.h b/amarok/src/konquisidebar/universalamarok.h index f96b1de5..7db2770b 100644 --- a/amarok/src/konquisidebar/universalamarok.h +++ b/amarok/src/konquisidebar/universalamarok.h @@ -72,7 +72,7 @@ public: private: amarokWidget* widget; - KHTMLPart* browser; + TDEHTMLPart* browser; TQString amarokPlaying; DCOPClient* amarokDCOP; TQFileInfo* fileInfo; diff --git a/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp b/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp index 4465fa9a..3e833123 100644 --- a/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp +++ b/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp @@ -26,7 +26,7 @@ #include MagnatuneArtistInfoBox::MagnatuneArtistInfoBox( TQWidget *parentWidget, const char *widgetname ) - : KHTMLPart( parentWidget, widgetname ) + : TDEHTMLPart( parentWidget, widgetname ) {} diff --git a/amarok/src/magnatunebrowser/magnatuneartistinfobox.h b/amarok/src/magnatunebrowser/magnatuneartistinfobox.h index a9b02293..490aea08 100644 --- a/amarok/src/magnatunebrowser/magnatuneartistinfobox.h +++ b/amarok/src/magnatunebrowser/magnatuneartistinfobox.h @@ -29,11 +29,11 @@ #include /** -A specialized KHTMLPart for displaying html info about a Magnatune artist or album +A specialized TDEHTMLPart for displaying html info about a Magnatune artist or album @author Nikolaj Hald Nielsen */ -class MagnatuneArtistInfoBox : public KHTMLPart +class MagnatuneArtistInfoBox : public TDEHTMLPart { Q_OBJECT diff --git a/amarok/src/playlistbrowser.cpp b/amarok/src/playlistbrowser.cpp index 4ecdba3f..de89c6a2 100644 --- a/amarok/src/playlistbrowser.cpp +++ b/amarok/src/playlistbrowser.cpp @@ -3156,8 +3156,8 @@ InfoPane::InfoPane( TQWidget *parent ) InfoPane::~InfoPane() { - // Ensure the KHTMLPart dies before its KHTMLView dies, - // because KHTMLPart's dtoring relies on its KHTMLView still being alive + // Ensure the TDEHTMLPart dies before its TDEHTMLView dies, + // because TDEHTMLPart's dtoring relies on its TDEHTMLView still being alive // (see bug 130494). delete m_infoBrowser; } diff --git a/amarok/src/tagdialog.cpp b/amarok/src/tagdialog.cpp index 39ea2860..047a64b4 100644 --- a/amarok/src/tagdialog.cpp +++ b/amarok/src/tagdialog.cpp @@ -416,7 +416,7 @@ void TagDialog::init() const TQStringList labels = CollectionDB::instance()->labelList(); //TODO: figure out a way to add auto-completion support to kTestEdit_selectedLabels - //m_labelCloud = new KHTMLPart( labels_favouriteLabelsFrame ); + //m_labelCloud = new TDEHTMLPart( labels_favouriteLabelsFrame ); m_labelCloud = new HTMLView( labels_favouriteLabelsFrame ); m_labelCloud->view()->setSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored, false ); m_labelCloud->view()->setVScrollBarMode( TQScrollView::AlwaysOff ); diff --git a/amarok/src/tagdialog.h b/amarok/src/tagdialog.h index 81255955..e1493957 100644 --- a/amarok/src/tagdialog.h +++ b/amarok/src/tagdialog.h @@ -127,7 +127,7 @@ class TagDialog : public TagDialogBase TQStringList m_removedLabels; KURL m_mbTrack; TQString m_commaSeparatedLabels; - //KHTMLPart *m_labelCloud; + //TDEHTMLPart *m_labelCloud; HTMLView *m_labelCloud; }; diff --git a/cmake b/cmake index 9a217903..274366fb 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 9a217903f9fa35ca12213a6e9ee3d2cb87d1131d +Subproject commit 274366fb8b90704586d7beef216b765cc0688b08