Rename kiobuffer and KHTML

pull/1/head
Timothy Pearson 12 years ago
parent fec3b97db2
commit 741251f280

@ -1 +1 @@
Subproject commit 9a217903f9fa35ca12213a6e9ee3d2cb87d1131d Subproject commit 274366fb8b90704586d7beef216b765cc0688b08

@ -35,7 +35,7 @@ kalzium_SOURCES = eqresult.cpp eqchemview.cpp kalzium.cpp \
moleculeparser.cpp \ moleculeparser.cpp \
tempunit.cpp tempunit.cpp
kalzium_LDADD = ../../libtdeedu/tdeeduplot/libtdeeduplot.la ../../libtdeedu/tdeeduui/libtdeeduui.la $(LIB_KIO) $(LIB_TDEUI) $(LIB_KHTML) $(OCAMLLIB_FLAGS) $(FACILELIB_FLAGS) $(EQCHEM_LDADD) kalzium_LDADD = ../../libtdeedu/tdeeduplot/libtdeeduplot.la ../../libtdeedu/tdeeduui/libtdeeduui.la $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDEHTML) $(OCAMLLIB_FLAGS) $(FACILELIB_FLAGS) $(EQCHEM_LDADD)
KDE_CXXFLAGS = -D_ISOC99_SOURCE KDE_CXXFLAGS = -D_ISOC99_SOURCE
SUBDIRS = icons elementpics data $(EQCHEM_SUB) SUBDIRS = icons elementpics data $(EQCHEM_SUB)

@ -91,18 +91,18 @@ void DetailedInfoDlg::setElement(Element *element)
enableButton( User1, false ); enableButton( User1, false );
} }
KHTMLPart* DetailedInfoDlg::addHTMLTab( const TQString& title, const TQString& icontext, const TQString& iconname ) TDEHTMLPart* DetailedInfoDlg::addHTMLTab( const TQString& title, const TQString& icontext, const TQString& iconname )
{ {
TQFrame *frame = addPage(title, icontext, BarIcon(iconname)); TQFrame *frame = addPage(title, icontext, BarIcon(iconname));
TQVBoxLayout *layout = new TQVBoxLayout( frame ); TQVBoxLayout *layout = new TQVBoxLayout( frame );
layout->setMargin( 0 ); layout->setMargin( 0 );
KHTMLPart *w = new KHTMLPart( frame, "html-part", TQT_TQOBJECT(frame) ); TDEHTMLPart *w = new TDEHTMLPart( frame, "html-part", TQT_TQOBJECT(frame) );
layout->addWidget( w->view() ); layout->addWidget( w->view() );
return w; return w;
} }
void DetailedInfoDlg::fillHTMLTab( KHTMLPart* htmlpart, const TQString& htmlcode ) void DetailedInfoDlg::fillHTMLTab( TDEHTMLPart* htmlpart, const TQString& htmlcode )
{ {
if ( !htmlpart ) return; if ( !htmlpart ) return;

@ -30,7 +30,7 @@ class TQFrame;
class TQLabel; class TQLabel;
class TQVBoxLayout; class TQVBoxLayout;
class KActionCollection; class KActionCollection;
class KHTMLPart; class TDEHTMLPart;
/** /**
* @short The dialog which shows all available information of an element * @short The dialog which shows all available information of an element
@ -63,7 +63,7 @@ class DetailedInfoDlg : public KDialogBase
TQString isotopeTable(); TQString isotopeTable();
TQMap<TQString, KHTMLPart*> m_htmlpages; TQMap<TQString, TDEHTMLPart*> m_htmlpages;
TQLabel *piclabel; TQLabel *piclabel;
@ -93,17 +93,17 @@ class DetailedInfoDlg : public KDialogBase
* @param icontext The name of the tab, appears belov or instead * @param icontext The name of the tab, appears belov or instead
* of the icon * of the icon
* @param iconname The name of the icon * @param iconname The name of the icon
* @returns the pointer to the resulting KHTMLPart, needed for * @returns the pointer to the resulting TDEHTMLPart, needed for
* writing HTML code on it * writing HTML code on it
*/ */
KHTMLPart* addHTMLTab( const TQString& title, const TQString& icontext, const TQString& iconname ); TDEHTMLPart* addHTMLTab( const TQString& title, const TQString& icontext, const TQString& iconname );
/** /**
* Change the HTML code in an HTML page. * Change the HTML code in an HTML page.
* *
* @param htmlpart the KHTMLPart to edit * @param htmlpart the TDEHTMLPart to edit
* @param htmlcode the HTML code to display * @param htmlcode the HTML code to display
*/ */
void fillHTMLTab( KHTMLPart* htmlpart, const TQString& htmlcode ); void fillHTMLTab( TDEHTMLPart* htmlpart, const TQString& htmlcode );
protected slots: protected slots:
virtual void slotUser1(); virtual void slotUser1();

@ -153,5 +153,5 @@
- there should be a way to link a figure to a (html?) file containing - there should be a way to link a figure to a (html?) file containing
exercises. Teachers would be able to create exercises for Kig. exercises. Teachers would be able to create exercises for Kig.
I'm thinking of doing this with HTML (& KHTML) + scripting ( but I'm thinking of doing this with HTML (& TDEHTML) + scripting ( but
this is _distant_ future.. ) this is _distant_ future.. )

@ -997,10 +997,10 @@ void MainWindow::slotContextHelp()
{ {
// somehow the 'anchor' parameter of invokeHelp is not working correcctly (yet) // somehow the 'anchor' parameter of invokeHelp is not working correcctly (yet)
// this is/was appearently a bug in KHTML that Waldo Bastian kindly and quikly fixed. // this is/was appearently a bug in TDEHTML that Waldo Bastian kindly and quikly fixed.
// Ooh... and we also want a DCOPmethod to close the sidebar since it over-informs... // Ooh... and we also want a DCOPmethod to close the sidebar since it over-informs...
// Ooh3... we want fancy help (using KHTML) @ errormessage dialog // Ooh3... we want fancy help (using TDEHTML) @ errormessage dialog
// Ooh4... And we might also have to keep track of the KHelpCenter instance we open so // Ooh4... And we might also have to keep track of the KHelpCenter instance we open so
// we will not end up with loads of them // we will not end up with loads of them
// //

@ -10,7 +10,7 @@ libtdeeduuiincludedir = $(includedir)/libtdeedu
libtdeeduuiinclude_HEADERS = tdeeduglossary.h libtdeeduuiinclude_HEADERS = tdeeduglossary.h
libtdeeduui_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:5:0 libtdeeduui_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:5:0
libtdeeduui_la_LIBADD = $(LIB_TDECORE) $(LIB_KIO) $(LIB_TDEUI) $(LIB_KHTML) $(LIB_QT) libtdeeduui_la_LIBADD = $(LIB_TDECORE) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_QT)
METASOURCES = AUTO METASOURCES = AUTO

@ -201,7 +201,7 @@ GlossaryDialog::GlossaryDialog( bool folded, TQWidget *parent, const char *name)
m_search->setListView( m_glosstree ); m_search->setListView( m_glosstree );
m_htmlpart = new KHTMLPart( vs, "html-part" ); m_htmlpart = new TDEHTMLPart( vs, "html-part" );
connect( m_htmlpart->browserExtension(), TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), this, TQT_SLOT( displayItem( const KURL &, const KParts::URLArgs & ) ) ); connect( m_htmlpart->browserExtension(), TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), this, TQT_SLOT( displayItem( const KURL &, const KParts::URLArgs & ) ) );
connect( m_glosstree, TQT_SIGNAL(clicked( TQListViewItem * )), this, TQT_SLOT(slotClicked( TQListViewItem * ))); connect( m_glosstree, TQT_SIGNAL(clicked( TQListViewItem * )), this, TQT_SLOT(slotClicked( TQListViewItem * )));

@ -265,7 +265,7 @@ class GlossaryDialog : public KDialogBase
void updateTree(); void updateTree();
KHTMLPart *m_htmlpart; TDEHTMLPart *m_htmlpart;
KListView *m_glosstree; KListView *m_glosstree;
TQString m_htmlbasestring; TQString m_htmlbasestring;

Loading…
Cancel
Save