1 files changed, 18 insertions, 20 deletions

diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index 1b6decfe3..972d8a7ea 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -32,7 +32,7 @@
 #include <signal.h>
 
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqimage.h>
 #include <tqfile.h>
 #include "test_regression.h"
@@ -44,7 +44,7 @@
 #include "katefactory.h"
 #include <tdeio/job.h>
 #include <tdemainwindow.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdeglobalsettings.h>
 
 #include <tqcolor.h>
@@ -365,7 +365,7 @@ KJS::Value OutputFunction::call(KJS::ExecState *exec, KJS::Object &thisObj, cons
 const char failureSnapshotPrefix[] = "testkateregressionrc-FS.";
 
 static TQString findMostRecentFailureSnapshot() {
-    TQDir dir(kapp->dirs()->saveLocation("config"),
+    TQDir dir(tdeApp->dirs()->saveLocation("config"),
              TQString(failureSnapshotPrefix)+"*",
              TQDir::Time, TQDir::Files);
     return dir[0].mid(sizeof failureSnapshotPrefix - 1);
@@ -464,7 +464,7 @@ int main(int argc, char *argv[])
     TDEApplication a;
     a.disableAutoDcopRegistration();
     a.setStyle("windows");
-    KSimpleConfig cfg( "testkateregressionrc" );
+    TDESimpleConfig cfg( "testkateregressionrc" );
     cfg.setGroup("Kate Document Defaults");
     cfg.writeEntry("Basic Config Flags",
       KateDocumentConfig::cfBackspaceIndents
@@ -492,7 +492,7 @@ int main(int argc, char *argv[])
     int rv = 1;
 
     {
-        KSimpleConfig dc( "kdebugrc" );
+        TDESimpleConfig dc( "kdebugrc" );
         // FIXME adapt to kate
         static int areas[] = { 1000, 13000, 13001, 13002, 13010,
                                13020, 13025, 13030, 13033, 13035,
@@ -549,10 +549,10 @@ int main(int argc, char *argv[])
                                                         baseDir,
                                                         args->getOption("output"),
                                                         args->isSet("genoutput"));
-    TQObject::connect(part->browserExtension(), TQT_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)),
-		     regressionTest, TQT_SLOT(slotOpenURL(const KURL&, const KParts::URLArgs &)));
-    TQObject::connect(part->browserExtension(), TQT_SIGNAL(resizeTopLevelWidget( int, int )),
-		     regressionTest, TQT_SLOT(resizeTopLevelWidget( int, int )));
+    TQObject::connect(part->browserExtension(), TQ_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)),
+		     regressionTest, TQ_SLOT(slotOpenURL(const KURL&, const KParts::URLArgs &)));
+    TQObject::connect(part->browserExtension(), TQ_SIGNAL(resizeTopLevelWidget( int, int )),
+		     regressionTest, TQ_SLOT(resizeTopLevelWidget( int, int )));
 
     regressionTest->m_keepOutput = args->isSet("keep-output");
     regressionTest->m_showGui = args->isSet("show");
@@ -563,14 +563,14 @@ int main(int argc, char *argv[])
             failureSnapshot = findMostRecentFailureSnapshot();
         if (!failureSnapshot.isEmpty())
             regressionTest->setFailureSnapshotConfig(
-                    new KSimpleConfig(failureSnapshotPrefix + failureSnapshot, true),
+                    new TDESimpleConfig(failureSnapshotPrefix + failureSnapshot, true),
                     failureSnapshot);
     }
 
     if (args->isSet("save-failures")) {
         TQString failureSaver = args->getOption("save-failures");
         regressionTest->setFailureSnapshotSaver(
-                new KSimpleConfig(failureSnapshotPrefix + failureSaver, false),
+                new TDESimpleConfig(failureSnapshotPrefix + failureSaver, false),
                 failureSaver);
     }
 
@@ -628,7 +628,7 @@ int main(int argc, char *argv[])
                 link += TQString(" <p style=\"color:green;font-weight:bold\">%1 new passes since %2</p>")
                         .arg(regressionTest->m_passes_new)
                         .arg(regressionTest->m_failureComp->group());
-            list.tqwriteBlock( link.latin1(), link.length() );
+            list.writeBlock( link.latin1(), link.length() );
             list.close();
 	}
     }
@@ -681,12 +681,12 @@ RegressionTest::RegressionTest(KateDocument *part, TDEConfig *baseConfig,
     TQString s;
     f.open( IO_WriteOnly | IO_Truncate );
     s = "<html><body>Follow the white rabbit";
-    f.tqwriteBlock( s.latin1(), s.length() );
+    f.writeBlock( s.latin1(), s.length() );
     f.close();
     f.setName( m_outputDir + "/index.html" );
     f.open( IO_WriteOnly | IO_Truncate );
     s = "<html><frameset cols=150,*><frame src=links.html><frame name=content src=empty.html>";
-    f.tqwriteBlock( s.latin1(), s.length() );
+    f.writeBlock( s.latin1(), s.length() );
     f.close();
 
     curr = this;
@@ -848,7 +848,7 @@ void RegressionTest::createLink( const TQString& test, int failures )
     if (failures & NewFailure)
         link += "</span>";
     link += "<br>\n";
-    list.tqwriteBlock( link.latin1(), link.length() );
+    list.writeBlock( link.latin1(), link.length() );
     list.close();
 }
 
@@ -906,7 +906,7 @@ static void pause(int msec)
     TQTime t;
     t.start();
     do {
-        kapp->processEvents();
+        tdeApp->processEvents();
     } while (t.elapsed() < msec);
 }
 
@@ -1020,7 +1020,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
     cl += "<div id='dom' class='diff'>" + domDiff + "</div>";
 
     cl += "</body></html>";
-    compare.tqwriteBlock( cl.latin1(), cl.length() );
+    compare.writeBlock( cl.latin1(), cl.length() );
     compare.close();
 }
 
@@ -1068,7 +1068,7 @@ void RegressionTest::testStaticFile(const TQString & filename, const TQStringLis
 
     if (!script_error) goto bail_out;
 
-    if (m_showGui) kapp->processEvents();
+    if (m_showGui) tdeApp->processEvents();
 
     if ( m_genOutput ) {
         reportResult(checkOutput(filename+"-result"), "result");
@@ -1340,5 +1340,3 @@ void RegressionTest::resizeTopLevelWidget( int w, int h )
 }
 
 #include "test_regression.moc"
-
-// kate: indent-width 4