rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/kofficeui/Kolinestyleaction.cpp b/lib/kofficeui/Kolinestyleaction.cpp
index 0ef47518..5fa296f0 100644
--- a/lib/kofficeui/Kolinestyleaction.cpp
+++ b/lib/kofficeui/Kolinestyleaction.cpp
@@ -43,7 +43,7 @@ class KoLineStyleAction::KoLineStyleActionPrivate
 };
 
 KoLineStyleAction::KoLineStyleAction(const TQString &text, const TQString& icon,
-  TQObject* tqparent, const char* name) : KoSelectAction(text, icon, tqparent, name)
+  TQObject* parent, const char* name) : KoSelectAction(text, icon, parent, name)
 {
   d = new KoLineStyleActionPrivate;
    
@@ -51,7 +51,7 @@ KoLineStyleAction::KoLineStyleAction(const TQString &text, const TQString& icon,
 }
 
 KoLineStyleAction::KoLineStyleAction(const TQString &text, const TQString& icon, const TQObject* receiver,
-  const char* slot, TQObject* tqparent, const char* name) : KoSelectAction(text, icon, receiver, slot, tqparent, name)
+  const char* slot, TQObject* parent, const char* name) : KoSelectAction(text, icon, receiver, slot, parent, name)
 {
   d = new KoLineStyleActionPrivate;
   
@@ -66,7 +66,7 @@ KoLineStyleAction::~KoLineStyleAction()
 void KoLineStyleAction::createMenu()
 {
   KPopupMenu* popup = popupMenu();
-  TQBitmap tqmask;
+  TQBitmap mask;
   TQPixmap pix(70, 21);
   TQPainter p(&pix, popup);
   int cindex = 0;
@@ -79,8 +79,8 @@ void KoLineStyleAction::createMenu()
     pen.setStyle(static_cast<Qt::PenStyle>(i));
     p.setPen(pen);
     p.drawLine(0, 10, pix.width(), 10);
-    tqmask = pix;
-    pix.setMask(tqmask);
+    mask = pix;
+    pix.setMask(mask);
     popup->insertItem(pix,cindex++);
   }
 }