Remove additional unneeded tq method conversions

8 files changed, 16 insertions, 16 deletions

diff --git a/knotes/ChangeLog b/knotes/ChangeLog
index 41ff85579..95990a9d2 100644
--- a/knotes/ChangeLog
+++ b/knotes/ChangeLog
@@ -3,7 +3,7 @@ ChangeLog for KNotes
 
 2006/07/10  Michael Brade <brade@kde.org>
 
-    * added DCOP methods to get and change tqgeometry:
+    * added DCOP methods to get and change geometry:
 	  height(), width(), move(), resize()
 
 2006/06/10  Michael Brade <brade@kde.org>
@@ -631,7 +631,7 @@ ChangeLog for KNotes
       - removed the size setting from the local note config dialog
       - #20172: separate font settings for title and body
     * don't reload the display setting if changing e.g. only the color -
-      the note's tqgeometry could have been changed already
+      the note's geometry could have been changed already
     * fixed some bugs introduced by the QTextEdit port
 
 2001/06/10  Michael Brade <brade@informatik.uni-muenchen.de>
@@ -922,7 +922,7 @@ Mon Nov 17 21:32:28 1997  Didier Belot <dib@avo.fr>
 
 Sat Nov 22 13:13:05 1997 Matthias Ettrich <ettrich@kde.org>
 
-    * sessionmanagement: uses kwm properties now, not only tqgeometry info
+    * sessionmanagement: uses kwm properties now, not only geometry info
     * look: pretty thin border. KPostit does no longer inherit QMultiline
             but simply QFrame. New class: KPostitMultilineEdit.
             New QMessage box for warning. Icon+Miniicon.
diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index 0571bb1bc..e22ab4285 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"
          )
@@ -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();
@@ -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 );
 
diff --git a/knotes/knotebutton.cpp b/knotes/knotebutton.cpp
index 002dd0f61..be141088d 100644
--- a/knotes/knotebutton.cpp
+++ b/knotes/knotebutton.cpp
@@ -49,13 +49,13 @@ KNoteButton::~KNoteButton()
 void KNoteButton::enterEvent( TQEvent * )
 {
     m_flat = false;
-    tqrepaint( false );
+    repaint( false );
 }
 
 void KNoteButton::leaveEvent( TQEvent * )
 {
     m_flat = true;
-    tqrepaint();
+    repaint();
 }
 
 TQSize KNoteButton::sizeHint() const
diff --git a/knotes/knoteprinter.cpp b/knotes/knoteprinter.cpp
index a94e46310..c58031671 100644
--- a/knotes/knoteprinter.cpp
+++ b/knotes/knoteprinter.cpp
@@ -71,7 +71,7 @@ void KNotePrinter::doPrint( KPrinter& printer, TQPainter& painter,
 {
     const int margin = 40;  // pt
 
-    TQPaintDeviceMetrics metrics( painter.tqdevice() );
+    TQPaintDeviceMetrics metrics( painter.device() );
     int marginX = margin * metrics.logicalDpiX() / 72;
     int marginY = margin * metrics.logicalDpiY() / 72;
 
@@ -117,7 +117,7 @@ void KNotePrinter::printNote( const TQString& name, const TQString& content ) co
     KPrinter printer;
     printer.setFullPage( true );
 
-    if ( !printer.setup( 0, i18n("Print %1").tqarg(name) ) )
+    if ( !printer.setup( 0, i18n("Print %1").arg(name) ) )
         return;
     TQPainter painter;
     painter.begin( &printer );
diff --git a/knotes/knoteslegacy.cpp b/knotes/knoteslegacy.cpp
index 129517b30..006e35cdf 100644
--- a/knotes/knoteslegacy.cpp
+++ b/knotes/knoteslegacy.cpp
@@ -156,7 +156,7 @@ bool KNotesLegacy::convertKNotes1Config( Journal *journal, TQDir& noteDir,
     config.readConfig();
     config.setVersion( KNOTES_VERSION );
 
-    // get the tqgeometry
+    // get the geometry
     config.setWidth( props[3].toUInt() );
     config.setHeight( props[4].toUInt() );
 
diff --git a/knotes/knotesnetrecv.cpp b/knotes/knotesnetrecv.cpp
index 5c0be183a..9120336a8 100644
--- a/knotes/knotesnetrecv.cpp
+++ b/knotes/knotesnetrecv.cpp
@@ -66,8 +66,8 @@ KNotesNetworkReceiver::KNotesNetworkReceiver( KBufferedSocket *s )
     // Add the remote IP or hostname and the date to the title, to help the
     // user guess who wrote it.
     m_titleAddon = TQString(" [%1, %2]")
-                   .tqarg( m_sock->peerAddress().nodeName() )
-                   .tqarg( date );
+                   .arg( m_sock->peerAddress().nodeName() )
+                   .arg( date );
 
     // Setup the communications
     connect( m_sock, TQT_SIGNAL(readyRead()), TQT_SLOT(slotDataAvailable()) );
diff --git a/knotes/knotesnetsend.cpp b/knotes/knotesnetsend.cpp
index ca3005d6a..42ff66fc9 100644
--- a/knotes/knotesnetsend.cpp
+++ b/knotes/knotesnetsend.cpp
@@ -91,7 +91,7 @@ void KNotesNetworkSender::slotReadyWrite()
 void KNotesNetworkSender::slotError( int err )
 {
     KMessageBox::sorry( 0, i18n("Communication error: %1")
-           .tqarg( TQString(KNetwork::KSocketBase::errorString( static_cast<KSocketBase::SocketError>(err) )) )
+           .arg( TQString(KNetwork::KSocketBase::errorString( static_cast<KSocketBase::SocketError>(err) )) )
     );
     slotClosed();
 }
diff --git a/knotes/resourcelocal.cpp b/knotes/resourcelocal.cpp
index a4e2cf70c..53ea68ac8 100644
--- a/knotes/resourcelocal.cpp
+++ b/knotes/resourcelocal.cpp
@@ -89,7 +89,7 @@ bool ResourceLocal::save()
                             i18n("<qt>Unable to save the notes to <b>%1</b>. "
                                  "Check that there is sufficient disk space."
                                  "<br>There should be a backup in the same directory "
-                                 "though.</qt>").tqarg( mURL.path() ) );
+                                 "though.</qt>").arg( mURL.path() ) );
         return false;
     }