9 files changed, 11 insertions, 15 deletions
diff --git a/konqueror/about/CMakeLists.txt b/konqueror/about/CMakeLists.txt
index 9d77c04be..ffa5d4b96 100644
--- a/konqueror/about/CMakeLists.txt
+++ b/konqueror/about/CMakeLists.txt
@@ -47,7 +47,7 @@ install( FILES
 set( target konq_aboutpage )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES konq_aboutpage.cc
+  SOURCES konq_aboutpage.cpp
   LINK tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/konqueror/about/Makefile.am b/konqueror/about/Makefile.am
index 0a33f9bb7..f4ede2182 100644
--- a/konqueror/about/Makefile.am
+++ b/konqueror/about/Makefile.am
@@ -1,7 +1,7 @@
 kde_module_LTLIBRARIES = konq_aboutpage.la
 
 INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/libkonq $(all_includes)
-konq_aboutpage_la_SOURCES = konq_aboutpage.cc
+konq_aboutpage_la_SOURCES = konq_aboutpage.cpp
 konq_aboutpage_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 konq_aboutpage_la_LIBADD = $(LIB_TDEHTML)
 
diff --git a/konqueror/about/intro.html b/konqueror/about/intro.html
index efa4d62a9..d9a2943cc 100644
--- a/konqueror/about/intro.html
+++ b/konqueror/about/intro.html
@@ -87,4 +87,3 @@
   <div id="footer"><div id="footerL"/><div id="footerR"/></div>
 </body>
 </html>
-<!-- vim:set sw=2 et nocindent smartindent: -->
diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cpp
index cb2149f90..9d9fe4c71 100644
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cpp
@@ -8,7 +8,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <ksavefile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeaction.h>
 #include <kiconloader.h>
 #include <kurifilter.h>
@@ -54,7 +54,7 @@ KParts::Part *KonqAboutPageFactory::createPartObject( TQWidget *parentWidget, co
                                                       TQObject *parent, const char *name,
                                                       const char *, const TQStringList & )
 {
-    //KonqFrame *frame = tqt_dynamic_cast<KonqFrame *>( parentWidget );
+    //KonqFrame *frame = dynamic_cast<KonqFrame *>( parentWidget );
     //if ( !frame ) return 0;
 
     return new KonqAboutPage( //frame->childView()->mainWindow(),
@@ -81,7 +81,7 @@ TQString KonqAboutPageFactory::loadFile( const TQString& file )
 		       file.left( file.findRev( '/' )) +
 		       TQString::fromLatin1("/\">\n");
     TQRegExp reg("<head>");
-    reg.setCaseSensitive(FALSE);
+    reg.setCaseSensitive(false);
     res.replace(reg, "<head>\n\t" + basehref);
     return res;
 }
@@ -111,7 +111,7 @@ TQString KonqAboutPageFactory::launch()
   TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
 
   res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
-  if ( kapp->reverseLayout() )
+  if ( tdeApp->reverseLayout() )
     res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
   else
     res = res.arg( "" );
@@ -196,7 +196,7 @@ TQString KonqAboutPageFactory::intro()
     TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
 
     res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
-    if ( kapp->reverseLayout() )
+    if ( tdeApp->reverseLayout() )
 	res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
     else
 	res = res.arg( "" );
@@ -251,7 +251,7 @@ TQString KonqAboutPageFactory::specs()
 	return res;
 
     res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
-    if ( kapp->reverseLayout() )
+    if ( tdeApp->reverseLayout() )
 	res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
     else
 	res = res.arg( "" );
@@ -348,7 +348,7 @@ TQString KonqAboutPageFactory::tips()
     TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
 
     res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
-    if ( kapp->reverseLayout() )
+    if ( tdeApp->reverseLayout() )
 	res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
     else
 	res = res.arg( "" );
@@ -412,7 +412,7 @@ TQString KonqAboutPageFactory::plugins()
     if ( s_plugins_html )
         return *s_plugins_html;
 
-    TQString res = loadFile( locate( "data", kapp->reverseLayout() ? "konqueror/about/plugins_rtl.html" : "konqueror/about/plugins.html" ))
+    TQString res = loadFile( locate( "data", tdeApp->reverseLayout() ? "konqueror/about/plugins_rtl.html" : "konqueror/about/plugins.html" ))
                   .arg(i18n("Installed Plugins"))
                   .arg(i18n("<td>Plugin</td><td>Description</td><td>File</td><td>Types</td>"))
                   .arg(i18n("Installed"))
diff --git a/konqueror/about/konq_aboutpage.h b/konqueror/about/konq_aboutpage.h
index a4192d570..1c359a89e 100644
--- a/konqueror/about/konq_aboutpage.h
+++ b/konqueror/about/konq_aboutpage.h
@@ -34,7 +34,7 @@ private:
 
 class KonqAboutPage : public TDEHTMLPart
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KonqAboutPage( /*KonqMainWindow *mainWindow,*/
                    TQWidget *parentWidget, const char *widgetName,
diff --git a/konqueror/about/launch.html b/konqueror/about/launch.html
index 6e84049a7..a9d569350 100644
--- a/konqueror/about/launch.html
+++ b/konqueror/about/launch.html
@@ -131,4 +131,3 @@
   <div id="footer"><div id="footerL"/><div id="footerR"/></div>
 </body>
 </html>
-<!-- vim:set sw=2 et nocindent smartindent: -->
diff --git a/konqueror/about/specs.html b/konqueror/about/specs.html
index 752c162da..be40c90bb 100644
--- a/konqueror/about/specs.html
+++ b/konqueror/about/specs.html
@@ -204,4 +204,3 @@
   <div id="footer"><div id="footerL"/><div id="footerR"/></div>
 </body>
 </html>
-<!-- vim:set sw=2 et nocindent smartindent: -->
diff --git a/konqueror/about/tips.html b/konqueror/about/tips.html
index cf4a37862..085b630a8 100644
--- a/konqueror/about/tips.html
+++ b/konqueror/about/tips.html
@@ -124,4 +124,3 @@
   <div id="footer"><div id="footerL"/><div id="footerR"/></div>
 </body>
 </html>
-<!-- vim:set sw=2 et nocindent smartindent: -->
diff --git a/konqueror/about/top-right-konqueror.png b/konqueror/about/top-right-konqueror.png
index f685d4a3c..7ad4ea948 100644
--- a/konqueror/about/top-right-konqueror.png
+++ b/konqueror/about/top-right-konqueror.png