1 files changed, 23 insertions, 23 deletions

diff --git a/ksysv/TopWidget.cpp b/ksysv/TopWidget.cpp
index f039d63..b428b90 100644
--- a/ksysv/TopWidget.cpp
+++ b/ksysv/TopWidget.cpp
@@ -38,16 +38,16 @@
 #include <kprinter.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqbuttongroup.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqtooltip.h>
 #include <tqcheckbox.h>
 #include <tqhbox.h>
 #include <tqregexp.h>
 #include <tqdatastream.h>
 #include <tqpixmapcache.h>
-#include <tqtextview.h>
+#include <textview.h>
 #include <tqfileinfo.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqwhatsthis.h>
 #include <tqsimplerichtext.h>
 
@@ -87,12 +87,12 @@
 #include <tqlabel.h>
 #include <kstatusbar.h>
 
-namespace tqStatus
+namespace Status
 {
   enum {
     Changed, Checklist, Writable
   };
-} // namespace tqStatus
+} // namespace Status
 
 KSVTopLevel::KSVTopLevel()
   : KMainWindow(0, 0L, WStyle_ContextHelp|WDestructiveClose),
@@ -426,16 +426,16 @@ void KSVTopLevel::initStatusBar()
                                       "or ask your sysadmin to install %1 <em>suid</em> or " \
                                       "<em>sgid</em>.</p><p>The latter way is <strong>not</strong> "\
                                       "recommended though, due to security issues.</p>")
-                   .tqarg (kapp->aboutData()->programName()).tqarg(kapp->aboutData()->programName()));
+                   .arg (kapp->aboutData()->programName()).arg(kapp->aboutData()->programName()));
 
-  authIconBox->setMinimumSize (authIconBox->tqminimumSizeHint());
-  visBox->setMinimumSize (visBox->tqminimumSizeHint());
+  authIconBox->setMinimumSize (authIconBox->minimumSizeHint());
+  visBox->setMinimumSize (visBox->minimumSizeHint());
 
   status->addWidget (authIconBox, 0, false);
-  status->insertItem ("", tqStatus::Changed, 100);
+  status->insertItem ("", Status::Changed, 100);
   status->addWidget (visBox, 0, true);
 
-  status->setItemAlignment (tqStatus::Changed, AlignLeft|AlignVCenter);
+  status->setItemAlignment (Status::Changed, AlignLeft|AlignVCenter);
 }
 
 void KSVTopLevel::slotShowConfig()
@@ -499,7 +499,7 @@ void KSVTopLevel::saveOptions()
 
 void KSVTopLevel::slotUpdateRunning (const TQString& text)
 {
-  statusBar()->changeItem(text, tqStatus::Changed);
+  statusBar()->changeItem(text, Status::Changed);
 }
 
 void KSVTopLevel::editCut() {
@@ -508,7 +508,7 @@ void KSVTopLevel::editCut() {
   if (list && list->currentItem())
 	{
 	  KSVDrag* mime = new KSVDrag (*list->currentItem()->data(), 0L, 0L);
-	  kapp->tqclipboard()->setData (mime);
+	  kapp->clipboard()->setData (mime);
 
 	  KSVData data = *list->currentItem()->data();
 	  delete list->currentItem();
@@ -525,7 +525,7 @@ void KSVTopLevel::editCopy()
   if (list)
 	{
 	  KSVDrag* mime = new KSVDrag (*static_cast<KSVItem*> (list->currentItem()), 0L, 0L);
-	  kapp->tqclipboard()->setData (mime);
+	  kapp->clipboard()->setData (mime);
 	}
 }
 
@@ -537,7 +537,7 @@ void KSVTopLevel::editPaste()
     {
 	  KSVData data;
 
-	  if (KSVDrag::decodeNative (kapp->tqclipboard()->data(), data))
+	  if (KSVDrag::decodeNative (kapp->clipboard()->data(), data))
 		{
 		  KSVAction* action = 0L;
 
@@ -563,7 +563,7 @@ void KSVTopLevel::setChanged (bool val)
   mFileSave->setEnabled (val);
 
   // update statusbar
-  statusBar()->changeItem(val ? i18n(" Changed") : TQString(), tqStatus::Changed);
+  statusBar()->changeItem(val ? i18n(" Changed") : TQString(), Status::Changed);
 
   // clear messages
   statusBar()->clear();
@@ -651,7 +651,7 @@ void KSVTopLevel::print()
 //                   .arg (ksv::hostname()));
 //       y += fm.lineSpacing();
 
-//       p.drawText (10, y, TQDateTime::tqcurrentDateTime().toString());
+//       p.drawText (10, y, TQDateTime::currentDateTime().toString());
 //       y += fm.lineSpacing() * 2; // an extra empty line
 
 //       for (int i = 0; i < ksv::runlevelNumber; ++i)
@@ -659,7 +659,7 @@ void KSVTopLevel::print()
 //           p.setFont (TQFont("courier", 16, TQFont::Bold));
 //           TQFontMetrics fm = p.fontMetrics();
 
-//           p.drawText (10, y, i18n ("Runlevel %1").tqarg(i));
+//           p.drawText (10, y, i18n ("Runlevel %1").arg(i));
 //           y += fm.lineSpacing();
 
 //           checkPage
@@ -771,17 +771,17 @@ void KSVTopLevel::printLog()
         rheading.setWidth (&p, width);
         int tmp_h = rheading.height();
         TQRegion region (0, y, width, tmp_h);
-        rheading.draw (&p, 0, y, region, tqcolorGroup(), 0L);
+        rheading.draw (&p, 0, y, region, colorGroup(), 0L);
 
         y += tmp_h;
 
-        TQSimpleRichText rdate (i18n("<h3>Printed on %1</h3><br/><br/>").tqarg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime())),
+        TQSimpleRichText rdate (i18n("<h3>Printed on %1</h3><br/><br/>").arg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())),
                                TQFont("times"), TQString(), ksv::styleSheet(),
                                TQMimeSourceFactory::defaultFactory());
         rdate.setWidth (&p, width);
         tmp_h = rdate.height();
 	TQRegion r2 (0, y, width, tmp_h);
-        rdate.draw (&p, 0, y, r2, tqcolorGroup(), 0L);
+        rdate.draw (&p, 0, y, r2, colorGroup(), 0L);
 
         y += tmp_h;
       }
@@ -799,7 +799,7 @@ void KSVTopLevel::printLog()
                 break;
 
               TQRegion region (0, y, width, tmp_h);
-              rich.draw (&p, 0, y, region, tqcolorGroup(), 0L);
+              rich.draw (&p, 0, y, region, colorGroup(), 0L);
 
               y += tmp_h;
               ++line;
@@ -890,7 +890,7 @@ void KSVTopLevel::dispatchEdit ()
 	}
   else
 	{
-	  TQMimeSource* mime = kapp->tqclipboard()->data();
+	  TQMimeSource* mime = kapp->clipboard()->data();
 
 	  if (mime && mime->provides ("application/x-ksysv"))
 		setPaste (true);
@@ -938,7 +938,7 @@ void KSVTopLevel::slotSaveLog()
 
   s << "KDE System V Init Editor"
     << endl
-    << TQDateTime::tqcurrentDateTime().toString()
+    << TQDateTime::currentDateTime().toString()
     << endl << endl
     << mView->log()
     << endl;