1 files changed, 19 insertions, 19 deletions

diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index 430a5dca5..2b0ae9599 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -393,7 +393,7 @@ void KNote::slotKill( bool force )
     m_blockEmitDataChanged = true;
     if ( !force &&
          KMessageBox::warningContinueCancel( this,
-             i18n("<qt>Do you really want to delete note <b>%1</b>?</qt>").tqarg( m_label->text() ),
+             i18n("<qt>Do you really want to delete note <b>%1</b>?</qt>").arg( m_label->text() ),
              i18n("Confirm Delete"), KGuiItem( i18n("&Delete"), "editdelete" ),
              "ConfirmDeleteNote"
          )
@@ -772,7 +772,7 @@ void KNote::slotClose()
 
 void KNote::slotInsDate()
 {
-    m_editor->insert( KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()) );
+    m_editor->insert( KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()) );
 }
 
 void KNote::slotSetAlarm()
@@ -804,7 +804,7 @@ void KNote::slotPreferences()
 void KNote::slotSend()
 {
     // pop up dialog to get the IP
-    KNoteHostDlg hostDlg( i18n("Send \"%1\"").tqarg( name() ), this );
+    KNoteHostDlg hostDlg( i18n("Send \"%1\"").arg( name() ), this );
     aboutToEnterEventLoop();
     bool ok = (hostDlg.exec() == TQDialog::Accepted);
     eventLoopLeft();
@@ -859,7 +859,7 @@ void KNote::slotPrint()
     printer.setFont( m_config->font() );
     printer.setContext( m_editor->context() );
     printer.setStyleSheet( m_editor->styleSheet() );
-    printer.tqsetColorGroup( tqcolorGroup() );
+    printer.setColorGroup( colorGroup() );
     printer.printNote( TQString(), content );
 }
 
@@ -891,7 +891,7 @@ void KNote::slotSaveAs()
 
     if ( file.exists() &&
          KMessageBox::warningContinueCancel( this, i18n("<qt>A file named <b>%1</b> already exists.<br>"
-                           "Are you sure you want to overwrite it?</qt>").tqarg( TQFileInfo(file).fileName() ) )
+                           "Are you sure you want to overwrite it?</qt>").arg( TQFileInfo(file).fileName() ) )
          != KMessageBox::Continue )
     {
 	m_blockEmitDataChanged = false;
@@ -986,7 +986,7 @@ void KNote::slotUpdateDesktopActions()
 
     int count = wm_root.numberOfDesktops();
     for ( int n = 1; n <= count; n++ )
-        desktops.append( TQString("&%1 %2").tqarg( n ).tqarg( TQString::fromUtf8(wm_root.desktopName( n )) ) );
+        desktops.append( TQString("&%1 %2").arg( n ).arg( TQString::fromUtf8(wm_root.desktopName( n )) ) );
 
     m_toDesktop->setItems( desktops );
 
@@ -1020,7 +1020,7 @@ void KNote::createFold()
     TQPixmap fold( 15, 15 );
     TQPainter foldp( &fold );
     foldp.setPen( TQt::NoPen );
-    foldp.setBrush( tqpalette().active().dark() );
+    foldp.setBrush( palette().active().dark() );
     TQPointArray foldpoints( 3 );
     foldpoints.putPoints( 0, 3, 0, 0, 14, 0, 0, 14 );
     foldp.drawPolygon( foldpoints );
@@ -1033,16 +1033,16 @@ void KNote::updateLabelAlignment()
     // if the name is too long to fit, left-align it, otherwise center it (#59028)
     TQString labelText = m_label->text();
     if ( m_label->fontMetrics().boundingRect( labelText ).width() > m_label->width() )
-        m_label->tqsetAlignment( AlignLeft );
+        m_label->setAlignment( AlignLeft );
     else
-        m_label->tqsetAlignment( AlignHCenter );
+        m_label->setAlignment( AlignHCenter );
 }
 
 void KNote::updateFocus()
 {
     if ( hasFocus() )
     {
-        m_label->setBackgroundColor( tqpalette().active().shadow() );
+        m_label->setBackgroundColor( palette().active().shadow() );
         m_button->show();
 
         if ( !m_editor->isReadOnly() )
@@ -1081,11 +1081,11 @@ void KNote::updateFocus()
 
         if ( s_ppOffset )
         {
-            m_label->setBackgroundColor( tqpalette().active().midlight() );
+            m_label->setBackgroundColor( palette().active().midlight() );
             m_fold->show();
         }
         else
-            m_label->setBackgroundColor( tqpalette().active().background() );
+            m_label->setBackgroundColor( palette().active().background() );
     }
 }
 
@@ -1121,7 +1121,7 @@ void KNote::updateBackground( int y_offset )
 {
     if ( !s_ppOffset )
     {
-        m_editor->setPaper( TQBrush( tqcolorGroup().background() ) );
+        m_editor->setPaper( TQBrush( colorGroup().background() ) );
         return;
     }
 
@@ -1138,7 +1138,7 @@ void KNote::updateBackground( int y_offset )
 
     TQImage grad_img( w, h, 32 );
     TQRgb rgbcol;
-    TQColor bg = tqpalette().active().background();
+    TQColor bg = palette().active().background();
 
     for ( int i = 0; i < h; ++i )
     {
@@ -1161,7 +1161,7 @@ void KNote::updateBackground( int y_offset )
 
 void KNote::updateLayout()
 {
-    const int headerHeight = m_label->tqsizeHint().height();
+    const int headerHeight = m_label->sizeHint().height();
     const int margin = m_editor->margin();
     bool closeLeft = false;
 
@@ -1172,7 +1172,7 @@ void KNote::updateLayout()
     if ( s_ppOffset )
     {
         if ( !m_editor->paper().pixmap() )  // just changed the style
-            setColor( tqpalette().active().foreground(), tqpalette().active().background() );
+            setColor( palette().active().foreground(), palette().active().background() );
 
         m_pushpin->show();
         setFrameStyle( Panel | Raised );
@@ -1185,7 +1185,7 @@ void KNote::updateLayout()
     else
     {
         if ( m_editor->paper().pixmap() )  // just changed the style
-            setColor( tqpalette().active().foreground(), tqpalette().active().background() );
+            setColor( palette().active().foreground(), palette().active().background() );
 
         setFrameStyle( WinPanel | Raised );
         m_pushpin->hide();
@@ -1241,9 +1241,9 @@ void KNote::drawFrame( TQPainter *p )
     TQRect r = frameRect();
     r.setTop( s_ppOffset );
     if ( s_ppOffset )
-        qDrawShadePanel( p, r, tqcolorGroup(), false, lineWidth() );
+        qDrawShadePanel( p, r, colorGroup(), false, lineWidth() );
     else
-        qDrawWinPanel( p, r, tqcolorGroup(), false );
+        qDrawWinPanel( p, r, colorGroup(), false );
 }
 
 void KNote::showEvent( TQShowEvent * )