1 files changed, 9 insertions, 9 deletions

diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index f5ebfe3b..8a260576 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -79,8 +79,8 @@ using namespace KCal;
 
 int KNote::s_ppOffset = 0;
 
-KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *tqparent, const char *name )
-  : TQFrame( tqparent, name, WStyle_Customize | WStyle_NoBorder | WDestructiveClose ),
+KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *name )
+  : TQFrame( parent, name, WStyle_Customize | WStyle_NoBorder | WDestructiveClose ),
     m_label( 0 ), m_pushpin( 0 ), m_fold( 0 ), m_button( 0 ), m_tool( 0 ), m_editor( 0 ),
     m_config( 0 ), m_journal( j ), m_find( 0 ),
     m_kwinConf( KSharedConfig::openConfig( "kwinrc", true ) ),
@@ -200,17 +200,17 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *tqparent, const char
     m_editor->setCornerWidget( new TQSizeGrip( this ) );
     uint width = m_editor->cornerWidget()->width();
     uint height = m_editor->cornerWidget()->height();
-    TQBitmap tqmask;
-    tqmask.resize( width, height );
-    tqmask.fill( color0 );
+    TQBitmap mask;
+    mask.resize( width, height );
+    mask.fill( color0 );
     TQPointArray array;
     array.setPoints( 3, 0, height, width, height, width, 0 );
     TQPainter p;
-    p.begin( &tqmask );
+    p.begin( &mask );
     p.setBrush( color1 );
     p.drawPolygon( array );
     p.end();
-    m_editor->cornerWidget()->setMask( tqmask );
+    m_editor->cornerWidget()->setMask( mask );
     m_editor->cornerWidget()->setBackgroundMode( PaletteBase );
 
     // the config file location
@@ -319,7 +319,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *tqparent, const char
     // read configuration settings...
     slotApplyConfig();
 
-    // create the tqmask for the fold---to be done after slotApplyConfig(),
+    // create the mask for the fold---to be done after slotApplyConfig(),
     // which calls createFold()
     m_fold->setMask( TQRegion( m_fold->pixmap()->createHeuristicMask() ) );
 
@@ -1101,7 +1101,7 @@ void KNote::updateMask()
     int h = height();
     TQRegion reg( 0, s_ppOffset, w, h - s_ppOffset );
 
-    const TQBitmap *pushpin_bitmap = m_pushpin->pixmap()->tqmask();
+    const TQBitmap *pushpin_bitmap = m_pushpin->pixmap()->mask();
     TQRegion pushpin_reg( *pushpin_bitmap );
     m_pushpin->setMask( pushpin_reg );
     pushpin_reg.translate( m_pushpin->x(), m_pushpin->y() );