summaryrefslogtreecommitdiffstats
path: root/kmail/kmail_part.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
commita9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch)
treed087071b1e8fcf79698938efec19f8e48bab0799 /kmail/kmail_part.cpp
parent5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff)
downloadtdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz
tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmail/kmail_part.cpp')
-rw-r--r--kmail/kmail_part.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp
index 45da1cd7f..1f42a82ab 100644
--- a/kmail/kmail_part.cpp
+++ b/kmail/kmail_part.cpp
@@ -102,7 +102,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
TQWidget *canvas = new TQWidget(parentWidget, widgetName);
canvas->setFocusPolicy(TQ_ClickFocus);
setWidget(canvas);
- KGlobal::iconLoader()->addAppDir("kmail");
+ TDEGlobal::iconLoader()->addAppDir("kmail");
#if 0
//It's also possible to make a part out of a readerWin
KMReaderWin *mReaderWin = new KMReaderWin( canvas, canvas, actionCollection() );
@@ -117,7 +117,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
mReaderWin->setFocusPolicy(TQWidget::ClickFocus);
mStatusBar = new KMailStatusBarExtension(this);
//new KParts::SideBarExtension( kmkernel->mainWin()-mainKMWidget()->leftFrame(), this );
- KGlobal::iconLoader()->addAppDir("kmail");
+ TDEGlobal::iconLoader()->addAppDir("kmail");
setXMLFile( "kmail_part.rc" );
kmkernel->inboxFolder()->close();
#else
@@ -143,7 +143,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
connect( this, TQT_SIGNAL(textChanged(const TQString&)), ie, TQT_SIGNAL(textChanged(const TQString&)) );
connect( this, TQT_SIGNAL(iconChanged(const TQPixmap&)), ie, TQT_SIGNAL(iconChanged(const TQPixmap&)) );
- KGlobal::iconLoader()->addAppDir( "kmail" );
+ TDEGlobal::iconLoader()->addAppDir( "kmail" );
setXMLFile( "kmail_part.rc" );
#endif