Browse Source

Rename kiobuffer and KHTML

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
c5bee2a602
42 changed files with 51 additions and 51 deletions
  1. +1
    -1
      akregator/ChangeLog
  2. +2
    -2
      akregator/src/Makefile.am
  3. +1
    -1
      akregator/src/mainwindow.cpp
  4. +4
    -4
      akregator/src/pageviewer.cpp
  5. +2
    -2
      akregator/src/tabwidget.cpp
  6. +3
    -3
      akregator/src/viewer.cpp
  7. +1
    -1
      akregator/src/viewer.h
  8. +1
    -1
      cmake
  9. +1
    -1
      kaddressbook/Makefile.am
  10. +2
    -2
      kitchensync/src/Makefile.am
  11. +1
    -1
      kitchensync/src/aboutpage.cpp
  12. +1
    -1
      kmail/Mainpage.dox
  13. +1
    -1
      kmail/Makefile.am
  14. +1
    -1
      kmail/interfaces/htmlwriter.h
  15. +1
    -1
      kmail/kmmessage.cpp
  16. +1
    -1
      kmail/kmmessage.h
  17. +4
    -4
      kmail/kmreaderwin.cpp
  18. +5
    -5
      kmail/kmreaderwin.h
  19. +1
    -1
      kmail/tdehtmlparthtmlwriter.cpp
  20. +6
    -6
      kmail/tdehtmlparthtmlwriter.h
  21. +0
    -0
      kmobile/tdeioslave/tdeio_mobile.cpp
  22. +0
    -0
      kmobile/tdeioslave/tdeio_mobile.h
  23. +1
    -1
      knode/Makefile.am
  24. +2
    -2
      knode/articlewidget.cpp
  25. +2
    -2
      knode/articlewidget.h
  26. +1
    -1
      kontact/src/Makefile.am
  27. +1
    -1
      kontact/src/mainwindow.cpp
  28. +2
    -2
      kontact/src/mainwindow.h
  29. +1
    -1
      korganizer/Makefile.am
  30. +0
    -0
      korn/tdeio_count.cpp
  31. +0
    -0
      korn/tdeio_count.h
  32. +0
    -0
      korn/tdeio_delete.cpp
  33. +0
    -0
      korn/tdeio_delete.h
  34. +0
    -0
      korn/tdeio_proto.cpp
  35. +0
    -0
      korn/tdeio_proto.h
  36. +0
    -0
      korn/tdeio_read.cpp
  37. +0
    -0
      korn/tdeio_read.h
  38. +0
    -0
      korn/tdeio_single_subject.cpp
  39. +0
    -0
      korn/tdeio_single_subject.h
  40. +0
    -0
      korn/tdeio_subjects.cpp
  41. +0
    -0
      korn/tdeio_subjects.h
  42. +1
    -1
      libtdepim/csshelper.cpp

+ 1
- 1
akregator/ChangeLog View File

@@ -418,7 +418,7 @@ Changes from 0.9 to 1.0b1:
#000002 FIX [x] update ArticleList when selecting another feed
#000026 CHG [x] unless someone offers me some icons, Fetch and Fetch all will be 'down' and 'bottom' respectively
#000023 FIX [x] implement fetch all
#000024 CHG [x] replace generic HTML part with strictly KHTMLPart (saves some static_cast<>s)
#000024 CHG [x] replace generic HTML part with strictly TDEHTMLPart (saves some static_cast<>s)
#000018 ADD [x] provide .desktop file
#000017 ADD [x] provide .lsm file
#000016 ADD [x] provide standard AUTHORS, ChangeLog, README, and TODO files


+ 2
- 2
akregator/src/Makefile.am View File

@@ -78,7 +78,7 @@ libakregatorprivate_la_SOURCES = akregatorconfig.kcfgc \
libakregatorprivate_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined
libakregatorprivate_la_LIBADD = $(top_builddir)/libtdepim/libtdepim.la \
$(top_builddir)/akregator/src/librss/librsslocal.la $(LIB_KHTML)
$(top_builddir)/akregator/src/librss/librsslocal.la $(LIB_TDEHTML)

#########################################################################
# KPART SECTION
@@ -146,7 +146,7 @@ libakregatorpart_la_SOURCES = \
kspeech.stub

libakregatorpart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(LIB_KUTILS) -avoid-version -no-undefined $(all_libraries)
libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KHTML) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim
libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim

# this is where the desktop file will go
partdesktopdir = $(kde_servicesdir)


+ 1
- 1
akregator/src/mainwindow.cpp View File

@@ -237,7 +237,7 @@ bool MainWindow::queryExit()
kdDebug() << "MainWindow::queryExit()" << endl;
if ( !kapp->sessionSaving() )
{
delete m_part; // delete that here instead of dtor to ensure nested tdehtmlparts are deleted before singleton objects like KHTMLPageCache
delete m_part; // delete that here instead of dtor to ensure nested tdehtmlparts are deleted before singleton objects like TDEHTMLPageCache
m_part = 0;
}
else


+ 4
- 4
akregator/src/pageviewer.cpp View File

@@ -100,7 +100,7 @@ PageViewer::PageViewer(TQWidget *parent, const char *name)
{
// this hack is necessary since the part looks for []HTML Settings] in
// TDEGlobal::config() by default, which is wrong when running in Kontact
KHTMLSettings* s = const_cast<KHTMLSettings*> (settings());
TDEHTMLSettings* s = const_cast<TDEHTMLSettings*> (settings());
s->init(Settings::self()->config());
setXMLFile(locate("data", "akregator/pageviewer.rc"), true);
@@ -251,7 +251,7 @@ bool PageViewer::openURL(const KURL& url)
updateHistoryEntry(); // update old history entry before switching to the new one
emit started(0);

bool val = KHTMLPart::openURL(url);
bool val = TDEHTMLPart::openURL(url);
addHistoryEntry(url); // add new URL to history
@@ -358,7 +358,7 @@ void PageViewer::urlSelected(const TQString &url, int button, int state, const T
{
if (url.startsWith(TQString::fromLatin1( "javascript:" ), /*case-sensitive=*/false) )
{
KHTMLPart::urlSelected(url,button,state,_target,args);
TDEHTMLPart::urlSelected(url,button,state,_target,args);
}
else
{
@@ -400,7 +400,7 @@ void PageViewer::slotPaletteOrFontChanged()
// this hack is necessary since the part looks for []HTML Settings] in
// TDEGlobal::config() by default, which is wrong when running in Kontact
// NOTE: when running in Kontact, immediate updating doesn't work
KHTMLSettings* s = const_cast<KHTMLSettings*> (settings());
TDEHTMLSettings* s = const_cast<TDEHTMLSettings*> (settings());
s->init(Settings::self()->config());
}



+ 2
- 2
akregator/src/tabwidget.cpp View File

@@ -262,7 +262,7 @@ void TabWidget::slotDetachTab()
return;

KURL url;
KHTMLView* view = dynamic_cast<KHTMLView*>(d->currentItem);
TDEHTMLView* view = dynamic_cast<TDEHTMLView*>(d->currentItem);
if (!view)
return;
@@ -281,7 +281,7 @@ void TabWidget::slotCopyLinkAddress()
return;

KURL url;
KHTMLView* view = dynamic_cast<KHTMLView*>(d->currentItem);
TDEHTMLView* view = dynamic_cast<TDEHTMLView*>(d->currentItem);
if (!view)
return;


+ 3
- 3
akregator/src/viewer.cpp View File

@@ -48,7 +48,7 @@
namespace Akregator {

Viewer::Viewer(TQWidget *parent, const char *name)
: KHTMLPart(parent, name), m_url(0)
: TDEHTMLPart(parent, name), m_url(0)
{
setZoomFactor(100);
setMetaRefreshEnabled(true);
@@ -89,7 +89,7 @@ bool Viewer::closeURL()
{
emit browserExtension()->loadingProgress(-1);
emit canceled(TQString());
return KHTMLPart::closeURL();
return TDEHTMLPart::closeURL();
}

int Viewer::pointsToPixel(int pointSize) const
@@ -162,7 +162,7 @@ void Viewer::urlSelected(const TQString &url, int button, int state, const TQStr
}
return;
}
KHTMLPart::urlSelected(url,button,state,_target,args);
TDEHTMLPart::urlSelected(url,button,state,_target,args);
}

void Viewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kurl, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags kpf, mode_t)


+ 1
- 1
akregator/src/viewer.h View File

@@ -36,7 +36,7 @@ namespace TDEIO

namespace Akregator
{
class Viewer : public KHTMLPart
class Viewer : public TDEHTMLPart
{
Q_OBJECT


+ 1
- 1
cmake

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

+ 1
- 1
kaddressbook/Makefile.am View File

@@ -45,7 +45,7 @@ libkaddressbook_la_LIBADD = $(top_builddir)/kaddressbook/printing/libprinter.la
$(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
$(top_builddir)/libtdepim/libtdepim.la \
$(top_builddir)/libkcal/libkcal.la \
-lkabc_file $(LIB_KABC) $(LIB_KHTML) \
-lkabc_file $(LIB_KABC) $(LIB_TDEHTML) \
$(top_builddir)/kaddressbook/common/libkabcommon.la \
$(top_builddir)/kaddressbook/editors/libkabim.la \
-ltdeprint


+ 2
- 2
kitchensync/src/Makefile.am View File

@@ -32,7 +32,7 @@ libkitchensync_la_SOURCES = aboutpage.cpp mainwidget.cpp groupconfigdialog.cpp \
configguijescs.cpp configguievo2.cpp configguimoto.cpp configguisynce.cpp \
configguisunbird.cpp
libkitchensync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
libkitchensync_la_LIBADD = $(LIB_KIO) $(LIB_KHTML) $(top_builddir)/kitchensync/libqopensync/libqopensync.la \
libkitchensync_la_LIBADD = $(LIB_KIO) $(LIB_TDEHTML) $(top_builddir)/kitchensync/libqopensync/libqopensync.la \
$(LIB_KABC) $(top_builddir)/libtdepim/libtdepim.la $(top_builddir)/libkcal/libkcal.la \
$(LIB_QT)

@@ -41,7 +41,7 @@ kde_module_LTLIBRARIES = libkitchensyncpart.la

libkitchensyncpart_la_SOURCES = part.cpp
libkitchensyncpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
libkitchensyncpart_la_LIBADD = $(LIB_KPARTS) libkitchensync.la $(LIB_QT) $(LIB_KIO) $(LIB_KHTML) $(LIB_KABC) $(LIB_TDECORE) $(LIB_TDEUI)
libkitchensyncpart_la_LIBADD = $(LIB_KPARTS) libkitchensync.la $(LIB_QT) $(LIB_KIO) $(LIB_TDEHTML) $(LIB_KABC) $(LIB_TDECORE) $(LIB_TDEUI)

# Resources
kitchensyncdatadir = $(kde_datadir)/kitchensync


+ 1
- 1
kitchensync/src/aboutpage.cpp View File

@@ -61,7 +61,7 @@ AboutPage::AboutPage( TQWidget *parent )
else
content = content.arg( "" );

KHTMLPart *part = new KHTMLPart( this );
TDEHTMLPart *part = new TDEHTMLPart( this );
layout->addWidget( part->view() );

part->begin( KURL( location ) );


+ 1
- 1
kmail/Mainpage.dox View File

@@ -776,7 +776,7 @@ What happens when a message is to displayed in the reader window?
new way - by using AttachmentStrategy::Hidden). The HTML generation
is delegated to BodyPartFormatters, while the HTML is written to
HTMLWriters, which abstract away HTML sinks. One of those is
KHTMLPartHTMLWriter, which writes to the KHTMLPart in the
TDEHTMLPartHTMLWriter, which writes to the TDEHTMLPart in the
readerwindow. This is the current state of the code. The goal of the
ongoing refactoring is to make the HTML generation blissfully
ignorant of the readerwindow and to allow display plugins that can


+ 1
- 1
kmail/Makefile.am View File

@@ -32,7 +32,7 @@ libkmailprivate_la_LIBADD = \
../libksieve/libksieve.la ../libemailfunctions/libemailfunctions.la \
../certmanager/lib/libkleopatra.la $(INDEXLIB) \
../libkcal/libkcal.la \
$(LIB_KHTML) $(LIB_KSPELL) $(LIB_KABC)
$(LIB_TDEHTML) $(LIB_KSPELL) $(LIB_KABC)

kde_module_LTLIBRARIES = kcm_kmail.la libkmailpart.la libkmail_bodypartformatter_application_octetstream.la
libkmailpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined


+ 1
- 1
kmail/interfaces/htmlwriter.h View File

@@ -64,7 +64,7 @@ namespace KMail {
* @deprecated KMail should be ported to Interface::HtmlWriter. This
* interface exposes internal working models. The queueing
* vs. writing() issues exposed here should be hidden by using two
* different implementations of KHTMLPartHtmlWriter: one for
* different implementations of TDEHTMLPartHtmlWriter: one for
* queueing, and one for writing. This should be fixed before the
* release, so we an keep the plugin interface stable.
*


+ 1
- 1
kmail/kmmessage.cpp View File

@@ -800,7 +800,7 @@ TQString KMMessage::asPlainTextFromObjectTree( partNode *root, bool aStripSignat

// html -> plaintext conversion, if necessary:
if ( isHTML && mDecodeHTML ) {
KHTMLPart htmlPart;
TDEHTMLPart htmlPart;
htmlPart.setOnlyLocalReferences( true );
htmlPart.setMetaRefreshEnabled( false );
htmlPart.setPluginsEnabled( false );


+ 1
- 1
kmail/kmmessage.h View File

@@ -678,7 +678,7 @@ public:
static TQString generateMessageId( const TQString& addr );

/** Convert '<' into "&lt;" resp. '>' into "&gt;" in order to
* prevent their interpretation by KHTML.
* prevent their interpretation by TDEHTML.
* Does *not* use the TQt replace function but runs a very fast C code
* the same way as lf2crlf() does.
*/


+ 4
- 4
kmail/kmreaderwin.cpp View File

@@ -393,7 +393,7 @@ void KMReaderWin::createWidgets() {
setStyleDependantFrameWidth();
mBox->setFrameStyle( mMimePartTree->frameStyle() );
mColorBar = new HtmlStatusBar( mBox, "mColorBar" );
mViewer = new KHTMLPart( mBox, "mViewer" );
mViewer = new TDEHTMLPart( mBox, "mViewer" );
mSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
mSplitter->setResizeMode( mMimePartTree, TQSplitter::KeepSize );
}
@@ -1033,7 +1033,7 @@ void KMReaderWin::contactStatusChanged( const TQString &uid)
kdDebug( 5006 ) << "name is " << n.nodeName().string() << endl;
kdDebug( 5006 ) << "value of content was " << n.firstChild().nodeValue().string() << endl;
TQString newPresence = kmkernel->imProxy()->presenceString( uid );
if ( newPresence.isNull() ) // KHTML crashes if you setNodeValue( TQString() )
if ( newPresence.isNull() ) // TDEHTML crashes if you setNodeValue( TQString() )
newPresence = TQString::fromLatin1( "ENOIMRUNNING" );
n.firstChild().setNodeValue( newPresence );
// kdDebug( 5006 ) << "value of content is now " << n.firstChild().nodeValue().string() << endl;
@@ -2685,7 +2685,7 @@ bool KMReaderWin::eventFilter( TQObject *, TQEvent *e )
if ( e->type() == TQEvent::MouseMove ) {
TQMouseEvent* me = TQT_TQMOUSEEVENT( e );

// Handle this ourselves instead of connecting to mViewer::onURL(), since KHTML misses some
// Handle this ourselves instead of connecting to mViewer::onURL(), since TDEHTML misses some
// notifications in case we started a drag ourselves
slotUrlOn( linkForNode( mViewer->nodeUnderMouse() ) );

@@ -2695,7 +2695,7 @@ bool KMReaderWin::eventFilter( TQObject *, TQEvent *e )
mCanStartDrag = false;
slotUrlOn( TQString() );

// HACK: Send a mouse release event to the KHTMLView, as otherwise that will be missed in
// HACK: Send a mouse release event to the TDEHTMLView, as otherwise that will be missed in
// case we started a drag. If the event is missed, the HTML view gets into a wrong
// state, in which funny things like unsolicited drags start to happen.
TQMouseEvent mouseEvent( TQEvent::MouseButtonRelease, me->pos(), Qt::NoButton, Qt::NoButton );


+ 5
- 5
kmail/kmreaderwin.h View File

@@ -35,7 +35,7 @@ class KSelectAction;
class KRadioAction;
class KToggleAction;
class TDEConfigBase;
class KHTMLPart;
class TDEHTMLPart;
class KURL;

class KMFolder;
@@ -239,7 +239,7 @@ public:
bool isFixedFont() { return mUseFixedFont; }
void setUseFixedFont( bool useFixedFont ) { mUseFixedFont = useFixedFont; }

/** Return the HtmlWriter connected to the KHTMLPart we use */
/** Return the HtmlWriter connected to the TDEHTMLPart we use */
KMail::HtmlWriter * htmlWriter() { return mHtmlWriter; }

// Action to reply to a message
@@ -279,9 +279,9 @@ public:

void setUpdateAttachment( bool update = true ) { mAtmUpdate = update; }

/** Access to the KHTMLPart used for the viewer. Use with
/** Access to the TDEHTMLPart used for the viewer. Use with
care! */
KHTMLPart * htmlPart() const { return mViewer; }
TDEHTMLPart * htmlPart() const { return mViewer; }

/** Returns the current message or 0 if none. */
KMMessage* message(KMFolder** folder=0) const;
@@ -554,7 +554,7 @@ private:
TQHBox *mBox;
KMail::HtmlStatusBar *mColorBar;
KMMimePartTree* mMimePartTree;
KHTMLPart *mViewer;
TDEHTMLPart *mViewer;

const KMail::AttachmentStrategy * mAttachmentStrategy;
const KMail::HeaderStrategy * mHeaderStrategy;


+ 1
- 1
kmail/tdehtmlparthtmlwriter.cpp View File

@@ -46,7 +46,7 @@

namespace KMail {

KHtmlPartHtmlWriter::KHtmlPartHtmlWriter( KHTMLPart * part,
KHtmlPartHtmlWriter::KHtmlPartHtmlWriter( TDEHTMLPart * part,
TQObject * parent, const char * name )
: TQObject( parent, name ), HtmlWriter(),
mHtmlPart( part ), mHtmlTimer( 0, "mHtmlTimer" ), mState( Ended )


+ 6
- 6
kmail/tdehtmlparthtmlwriter.h View File

@@ -29,8 +29,8 @@
your version.
*/

#ifndef __KMAIL_KHTMLPARTHTMLWRITER_H__
#define __KMAIL_KHTMLPARTHTMLWRITER_H__
#ifndef __KMAIL_TDEHTMLPARTHTMLWRITER_H__
#define __KMAIL_TDEHTMLPARTHTMLWRITER_H__

#include "interfaces/htmlwriter.h"
#include <tqobject.h>
@@ -39,7 +39,7 @@
#include <tqtimer.h>

class TQString;
class KHTMLPart;
class TDEHTMLPart;

namespace KMail {

@@ -49,7 +49,7 @@ namespace KMail {
public:
// Key is Content-Id, value is URL
typedef TQMap<TQString, TQString> EmbeddedPartMap;
KHtmlPartHtmlWriter( KHTMLPart * part,
KHtmlPartHtmlWriter( TDEHTMLPart * part,
TQObject * parent=0, const char * name = 0 );
virtual ~KHtmlPartHtmlWriter();

@@ -68,7 +68,7 @@ namespace KMail {
void resolveCidUrls();

private:
KHTMLPart * mHtmlPart;
TDEHTMLPart * mHtmlPart;
TQStringList mHtmlQueue;
TQTimer mHtmlTimer;
enum State {
@@ -81,4 +81,4 @@ namespace KMail {

} // namespace KMail

#endif // __KMAIL_KHTMLPARTHTMLWRITER_H__
#endif // __KMAIL_TDEHTMLPARTHTMLWRITER_H__

kmobile/tdeioslave/kio_mobile.cpp → kmobile/tdeioslave/tdeio_mobile.cpp View File


kmobile/tdeioslave/kio_mobile.h → kmobile/tdeioslave/tdeio_mobile.h View File


+ 1
- 1
knode/Makefile.am View File

@@ -26,7 +26,7 @@ kcm_knode_la_LIBADD = libknodecommon.la $(LIB_TDECORE)
knconfigpages.lo: smtpaccountwidget_base.h

libknodecommon_la_LDFLAGS = -version-info 3:0:0 -no-undefined $(all_libraries)
libknodecommon_la_LIBADD = $(top_builddir)/libkmime/libkmime.la $(top_builddir)/libkpgp/libkpgp.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KSPELL) $(LIB_KABC) $(LIB_KFILE) $(LIB_KUTILS) $(LIBRESOLV) $(LIB_KHTML)
libknodecommon_la_LIBADD = $(top_builddir)/libkmime/libkmime.la $(top_builddir)/libkpgp/libkpgp.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KSPELL) $(LIB_KABC) $(LIB_KFILE) $(LIB_KUTILS) $(LIBRESOLV) $(LIB_TDEHTML)
libknodecommon_la_SOURCES = knconfigmanager.cpp \
knconfig.cpp \
knconfigwidgets.cpp \


+ 2
- 2
knode/articlewidget.cpp View File

@@ -96,7 +96,7 @@ ArticleWidget::ArticleWidget( TQWidget *parent,
mInstances.append( this );

TQHBoxLayout *box = new TQHBoxLayout( this );
mViewer = new KHTMLPart( this, "mViewer" );
mViewer = new TDEHTMLPart( this, "mViewer" );
box->addWidget( mViewer->widget() );
mViewer->widget()->setFocusPolicy( TQ_WheelFocus );
mViewer->setPluginsEnabled( false );
@@ -1105,7 +1105,7 @@ void ArticleWidget::cleanup()

bool ArticleWidget::atBottom() const
{
const KHTMLView *view = mViewer->view();
const TDEHTMLView *view = mViewer->view();
return view->contentsY() + view->visibleHeight() >= view->contentsHeight();
}



+ 2
- 2
knode/articlewidget.h View File

@@ -30,7 +30,7 @@ class TQTimer;
class KAction;
class KActionCollection;
class KActionMenu;
class KHTMLPart;
class TDEHTMLPart;
class KURL;
class KSelectAction;
class KToggleAction;
@@ -221,7 +221,7 @@ class ArticleWidget : public TQWidget, public KNJobConsumer {
/// mapping of temporary file names to part numbers
TQMap<TQString, int> mAttachementMap;

KHTMLPart *mViewer;
TDEHTMLPart *mViewer;
CSSHelper *mCSSHelper;

TQStringList mTempDirs, mTempFiles;


+ 1
- 1
kontact/src/Makefile.am View File

@@ -13,7 +13,7 @@ kontact_METASOURCES = AUTO
kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kontact_LDADD = $(top_builddir)/libtdepim/libtdepim.la \
$(top_builddir)/kontact/interfaces/libkpinterfaces.la libkontact.la \
$(LIB_KPARTS) $(LIB_KUTILS) $(LIB_KHTML)
$(LIB_KPARTS) $(LIB_KUTILS) $(LIB_TDEHTML)
kontact_SOURCES = main.cpp mainwindow.cpp sidepanebase.cpp \
iconsidepane.cpp aboutdialog.cpp profilemanager.cpp profiledialog.cpp \
kontactiface.skel


+ 1
- 1
kontact/src/mainwindow.cpp View File

@@ -312,7 +312,7 @@ void MainWindow::initAboutScreen()
TQHBox *introbox = new TQHBox( mPartsStack );
mPartsStack->addWidget( introbox );
mPartsStack->raiseWidget( introbox );
mIntroPart = new KHTMLPart( introbox );
mIntroPart = new TDEHTMLPart( introbox );
mIntroPart->widget()->setFocusPolicy( TQ_WheelFocus );
// Let's better be paranoid and disable plugins (it defaults to enabled):
mIntroPart->setPluginsEnabled( false );


+ 2
- 2
kontact/src/mainwindow.h View File

@@ -46,7 +46,7 @@ class KAction;
class TDEConfig;
class KPluginInfo;
class KRSqueezedTextLabel;
class KHTMLPart;
class TDEHTMLPart;
class KeyPressEater;

namespace KPIM
@@ -156,7 +156,7 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont
PluginList mDelayedPreload;
ActionPluginList mActionPlugins;
TQValueList<KPluginInfo*> mPluginInfos;
KHTMLPart *mIntroPart;
TDEHTMLPart *mIntroPart;

KRSqueezedTextLabel* mStatusMsgLabel;
KPIM::StatusbarProgressWidget *mLittleProgress;


+ 1
- 1
korganizer/Makefile.am View File

@@ -29,7 +29,7 @@ kcm_korganizer_la_LIBADD = libkorganizer.la $(top_builddir)/libtdepim/libtdepim.
kcm_korganizer_la_COMPILE_FIRST = koprefs_base.h kogroupwareprefspage.h

libkorganizerpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
libkorganizerpart_la_LIBADD = libkorganizer.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KPARTS) $(LIB_KIO) $(LIB_KHTML) $(LIB_TDEUI) -L$(top_builddir)/libtdepim/ -ltdepim -L$(top_builddir)/libkcal/ -lkcal -lkorganizer_calendar
libkorganizerpart_la_LIBADD = libkorganizer.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KPARTS) $(LIB_KIO) $(LIB_TDEHTML) $(LIB_TDEUI) -L$(top_builddir)/libtdepim/ -ltdepim -L$(top_builddir)/libkcal/ -lkcal -lkorganizer_calendar
libkorganizerpart_la_SOURCES = korganizer_part.cpp
libkorganizerpart_la_COMPILE_FIRST = publishdialog_base.h koprefs_base.h



korn/kio_count.cpp → korn/tdeio_count.cpp View File


korn/kio_count.h → korn/tdeio_count.h View File


korn/kio_delete.cpp → korn/tdeio_delete.cpp View File


korn/kio_delete.h → korn/tdeio_delete.h View File


korn/kio_proto.cpp → korn/tdeio_proto.cpp View File


korn/kio_proto.h → korn/tdeio_proto.h View File


korn/kio_read.cpp → korn/tdeio_read.cpp View File


korn/kio_read.h → korn/tdeio_read.h View File


korn/kio_single_subject.cpp → korn/tdeio_single_subject.cpp View File


korn/kio_single_subject.h → korn/tdeio_single_subject.h View File


korn/kio_subjects.cpp → korn/tdeio_subjects.cpp View File


korn/kio_subjects.h → korn/tdeio_subjects.h View File


+ 1
- 1
libtdepim/csshelper.cpp View File

@@ -509,7 +509,7 @@ namespace KPIM {
" padding: 0px ! important;\n"
" font-size:0.8em ! important;\n"
" border:1px solid %6 ! important;\n"
// FIXME: InfoBackground crashes KHTML
// FIXME: InfoBackground crashes TDEHTML
//" background-color:InfoBackground ! important;\n"
" background-color:%5 ! important;\n"
"}\n\n"


Loading…
Cancel
Save