4 files changed, 12 insertions, 22 deletions

diff --git a/kcontrol/input/xcursor/previewwidget.cpp b/kcontrol/input/xcursor/previewwidget.cpp
index 2f0ea6edc..324bb2aeb 100644
--- a/kcontrol/input/xcursor/previewwidget.cpp
+++ b/kcontrol/input/xcursor/previewwidget.cpp
@@ -348,6 +348,3 @@ void PreviewWidget::mouseMoveEvent( TQMouseEvent *e )
 		current = pos;
 	}
 }
-
-
-// vim: set noet ts=4 sw=4:
diff --git a/kcontrol/input/xcursor/previewwidget.h b/kcontrol/input/xcursor/previewwidget.h
index a6412a907..26ed17bb1 100644
--- a/kcontrol/input/xcursor/previewwidget.h
+++ b/kcontrol/input/xcursor/previewwidget.h
@@ -43,5 +43,3 @@ class PreviewWidget : public TQWidget
 
 
 #endif
-
-// vim: set noet ts=4 sw=4:
diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp
index cdffbd1bd..32e036f8c 100644
--- a/kcontrol/input/xcursor/themepage.cpp
+++ b/kcontrol/input/xcursor/themepage.cpp
@@ -22,9 +22,9 @@
 
 #include <tdelocale.h>
 #include <tdeaboutdata.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelistview.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdeglobalsettings.h>
 #include <kdialog.h>
 #include <tdemessagebox.h>
@@ -100,8 +100,8 @@ ThemePage::ThemePage( TQWidget* parent, const char* name )
 	listview->addColumn( i18n("Name") );
 	listview->addColumn( i18n("Description") );
 
-	connect( listview, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-			TQT_SLOT(selectionChanged(TQListViewItem*)) );
+	connect( listview, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+			TQ_SLOT(selectionChanged(TQListViewItem*)) );
 
 	themeDirs = getThemeBaseDirs();
 	insertThemes();
@@ -111,8 +111,8 @@ ThemePage::ThemePage( TQWidget* parent, const char* name )
 	installButton = new TQPushButton( i18n("Install New Theme..."), hbox );
 	removeButton = new TQPushButton( i18n("Remove Theme"), hbox );
 
-	connect( installButton, TQT_SIGNAL( clicked() ), TQT_SLOT( installClicked() ) );
-	connect( removeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeClicked() ) );
+	connect( installButton, TQ_SIGNAL( clicked() ), TQ_SLOT( installClicked() ) );
+	connect( removeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeClicked() ) );
 
 	// Disable the install button if ~/.icons isn't writable
 	TQString path = TQDir::homeDirPath() + "/.icons";
@@ -343,7 +343,7 @@ void ThemePage::insertTheme( const TQString &path )
 	TQString desc   = defaultThemeDescription( name );
 	TQString sample = "left_ptr";
 
-	KSimpleConfig c( path + "/index.theme", true ); // Open read-only
+	TDESimpleConfig c( path + "/index.theme", true ); // Open read-only
 	c.setGroup( "Icon Theme" );
 
 	// Don't insert the theme if it's hidden.
@@ -429,7 +429,7 @@ bool ThemePage::isCursorTheme( const TQString &theme, const int depth ) const
 			// Parse the index.theme file if one exists
 			if ( haveIndexFile )
 			{
-				KSimpleConfig c( indexfile, true ); // Open read-only
+				TDESimpleConfig c( indexfile, true ); // Open read-only
 				c.setGroup( "Icon Theme" );
 				inherit = c.readListEntry( "Inherits" );
 			}
@@ -493,7 +493,7 @@ void ThemePage::insertThemes()
 			// Parse the index.theme file if the theme has one.
 			if ( haveIndexFile )
 			{
-				KSimpleConfig c( indexfile, true );
+				TDESimpleConfig c( indexfile, true );
 				c.setGroup( "Icon Theme" );
 
 				// Skip this theme if it's hidden.
@@ -580,7 +580,7 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample )
 		// Calculate the image size
 		int size = kMax( iconSize, kMax( r.width(), r.height() ) );
 
-		// Create the intermediate QImage
+		// Create the intermediate TQImage
 		TQImage image( size, size, 32 );
 		image.setAlphaBuffer( true );
 
@@ -621,7 +621,7 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample )
 
 		// Scale down the image if we need to
 		if ( image.width() > iconSize || image.height() > iconSize )
-			image = image.smoothScale( iconSize, iconSize, TQ_ScaleMin );
+			image = image.smoothScale( iconSize, iconSize, TQImage::ScaleMin );
 
 		pix.convertFromImage( image );
 		XcursorImageDestroy( xcur );
@@ -639,6 +639,3 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample )
 
 	return pix;
 }
-
-
-// vim: set noet ts=4 sw=4:
diff --git a/kcontrol/input/xcursor/themepage.h b/kcontrol/input/xcursor/themepage.h
index 22bca16db..bc284aa48 100644
--- a/kcontrol/input/xcursor/themepage.h
+++ b/kcontrol/input/xcursor/themepage.h
@@ -34,7 +34,7 @@ struct ThemeInfo;
 
 class ThemePage : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		ThemePage( TQWidget* parent = 0, const char* name = 0 );
@@ -72,5 +72,3 @@ class ThemePage : public TQWidget
 };
 
 #endif // __THEMEPAGE_H
-
-// vim: set noet ts=4 sw=4: