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/editorwatcher.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'kmail/editorwatcher.cpp')

diff --git a/kmail/editorwatcher.cpp b/kmail/editorwatcher.cpp
index dbf5f3f96..bca75762f 100644
--- a/kmail/editorwatcher.cpp
+++ b/kmail/editorwatcher.cpp
@@ -49,13 +49,13 @@
 using namespace KMail;
 
 EditorWatcher::EditorWatcher(const KURL & url, const TQString &mimeType, bool openWith,
-                             TQObject * parent, TQWidget *parentWidget) :
+                             TQObject * parent, TQWidget *tqparentWidget) :
     TQObject( parent ),
     mUrl( url ),
     mMimeType( mimeType ),
     mOpenWith( openWith ),
     mEditor( 0 ),
-    mParentWidget( parentWidget ),
+    mParentWidget( tqparentWidget ),
     mHaveInotify( false ),
     mFileOpen( false ),
     mEditorRunning( false ),
@@ -127,11 +127,11 @@ void EditorWatcher::inotifyEvent()
       struct inotify_event *event = (struct inotify_event *) &buffer[offset];
       size -= sizeof( struct inotify_event ) + event->len;
       offset += sizeof( struct inotify_event ) + event->len;
-      if ( event->mask & IN_OPEN )
+      if ( event->tqmask & IN_OPEN )
         mFileOpen = true;
-      if ( event->mask & IN_CLOSE )
+      if ( event->tqmask & IN_CLOSE )
         mFileOpen = false;
-      if ( event->mask & IN_MODIFY )
+      if ( event->tqmask & IN_MODIFY )
         mFileModified = true;
     }
   }
-- 
cgit v1.2.1