From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 16 Feb 2011 20:17:18 +0000
Subject: Moved kpilot from kdepim to applications, as the core Trinity
 libraries should not contain hardware-dependent software

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kmail/kmail_part.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'kmail/kmail_part.cpp')

diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp
index 22d48f1e..cb40bc30 100644
--- a/kmail/kmail_part.cpp
+++ b/kmail/kmail_part.cpp
@@ -60,10 +60,10 @@ using KRecentAddress::RecentAddresses;
 typedef KParts::GenericFactory< KMailPart > KMailFactory;
 K_EXPORT_COMPONENT_FACTORY( libkmailpart, KMailFactory )
 
-KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
+KMailPart::KMailPart(TQWidget *tqparentWidget, const char *widgetName,
 		     TQObject *parent, const char *name, const TQStringList &) :
   DCOPObject("KMailIface"), KParts::ReadOnlyPart(parent, name),
-  mParentWidget( parentWidget )
+  mParentWidget( tqparentWidget )
 {
   kdDebug(5006) << "KMailPart()" << endl;
   kdDebug(5006) << "  InstanceName: " << kapp->instanceName() << endl;
@@ -99,7 +99,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
   kapp->dcopClient()->resume(); // Ok. We are ready for DCOP requests.
 
   // create a canvas to insert our widget
-  TQWidget *canvas = new TQWidget(parentWidget, widgetName);
+  TQWidget *canvas = new TQWidget(tqparentWidget, widgetName);
   canvas->setFocusPolicy(TQWidget::ClickFocus);
   setWidget(canvas);
   KGlobal::iconLoader()->addAppDir("kmail");
@@ -223,7 +223,7 @@ void KMailPart::guiActivateEvent(KParts::GUIActivateEvent *e)
   mainWidget->initializeFilterActions();
   mainWidget->initializeFolderShortcutActions();
   mainWidget->setupForwardingActionsList();
-  mainWidget->updateVactionScriptStatus();
+  mainWidget->updateVactionScripStatus();
 }
 
 void KMailPart::exit()
@@ -231,7 +231,7 @@ void KMailPart::exit()
   delete this;
 }
 
-TQWidget* KMailPart::parentWidget() const
+TQWidget* KMailPart::tqparentWidget() const
 {
   return mParentWidget;
 }
@@ -244,7 +244,7 @@ KMailStatusBarExtension::KMailStatusBarExtension( KMailPart *parent )
 
 KMainWindow * KMailStatusBarExtension::mainWindow() const
 {
-  return static_cast<KMainWindow*>( mParent->parentWidget() );
+  return static_cast<KMainWindow*>( mParent->tqparentWidget() );
 }
 
 #include "kmail_part.moc"
-- 
cgit v1.2.3