31 files changed, 167 insertions, 74 deletions

diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt
index a4714ce59..5ee2746cc 100644
--- a/kdesktop/CMakeLists.txt
+++ b/kdesktop/CMakeLists.txt
@@ -81,13 +81,13 @@ tde_add_executable( kcheckrunning
 ##### kdesktop (tdeinit) ########################
 
 set( target kdesktop )
-set_property( SOURCE lockeng.cc APPEND PROPERTY COMPILE_DEFINITIONS KDE_CONFDIR="${TDE_CONFIG_DIR}" )
+set_property( SOURCE lockeng.cpp APPEND PROPERTY COMPILE_DEFINITIONS KDE_CONFDIR="${TDE_CONFIG_DIR}" )
 
 set( ${target}_SRCS
-  main.cc krootwm.cc xautolock.cc kdiconview.cc init.cc
-  desktop.cc lockeng.cc KDesktopIface.skel bgmanager.cc
+  main.cpp krootwm.cpp xautolock.cpp kdiconview.cpp init.cpp
+  desktop.cpp lockeng.cpp KDesktopIface.skel bgmanager.cpp
   KScreensaverIface.skel minicli.cpp KBackgroundIface.skel
-  pixmapserver.cc kcustommenu.cc startupid.cpp minicli_ui.ui
+  pixmapserver.cpp kcustommenu.cpp startupid.cpp minicli_ui.ui
   xautolock_diy.c xautolock_engine.c kshadowengine.cpp
   kshadowsettings.cpp kdesktopshadowsettings.cpp
   tdefileividesktop.cpp kdesktopapp.cpp
diff --git a/kdesktop/Makefile.am b/kdesktop/Makefile.am
index bef2d3884..393b3c760 100644
--- a/kdesktop/Makefile.am
+++ b/kdesktop/Makefile.am
@@ -17,10 +17,10 @@ libkdesktopsettings_la_LDFLAGS = $(all_libraries) -no-undefined
 libkdesktopsettings_la_LIBADD = $(LIB_TDECORE)
 libkdesktopsettings_la_SOURCES = kdesktopsettings.kcfgc tdelaunchsettings.kcfgc 
 
-kdesktop_la_SOURCES = main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \
-	lockeng.cc KDesktopIface.skel \
-	bgmanager.cc init.cc KScreensaverIface.skel \
-	minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc \
+kdesktop_la_SOURCES = main.cpp krootwm.cpp xautolock.cpp kdiconview.cpp desktop.cpp \
+	lockeng.cpp KDesktopIface.skel \
+	bgmanager.cpp init.cpp KScreensaverIface.skel \
+	minicli.cpp KBackgroundIface.skel pixmapserver.cpp kcustommenu.cpp \
 	startupid.cpp minicli_ui.ui xautolock_diy.c xautolock_engine.c \
 	kshadowengine.cpp kshadowsettings.cpp \
 	kdesktopshadowsettings.cpp tdefileividesktop.cpp \
@@ -59,7 +59,7 @@ startupid.lo: tdelaunchsettings.h
 
 messages: rc.cpp
 	$(EXTRACTRC) lock/*.ui >> rc.cpp
-	$(XGETTEXT) lock/*.cc *.cc *.cpp *.h -o $(podir)/kdesktop.pot
+	$(XGETTEXT) lock/*.cpp *.cpp *.h -o $(podir)/kdesktop.pot
 
 menu_DATA = kdesktop_custom_menu1 kdesktop_custom_menu2
 menudir = $(kde_confdir)
diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cpp
index 7c641dd9d..7e90e8fca 100644
--- a/kdesktop/bgmanager.cc
+++ b/kdesktop/bgmanager.cpp
@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- * kate: space-indent on; tab-width 8; indent-width 4; indent-mode cstyle;
+/*
  *
  * This file is part of the KDE project, module kdesktop.
  * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
diff --git a/kdesktop/bgmanager.h b/kdesktop/bgmanager.h
index 43e57a372..b852a4adb 100644
--- a/kdesktop/bgmanager.h
+++ b/kdesktop/bgmanager.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * This file is part of the KDE project, module kdesktop.
  * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cpp
index 2732bff08..2732bff08 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cpp
diff --git a/kdesktop/init.cc b/kdesktop/init.cpp
index 6bf87f333..6bf87f333 100644
--- a/kdesktop/init.cc
+++ b/kdesktop/init.cpp
diff --git a/kdesktop/kcustommenu.cc b/kdesktop/kcustommenu.cpp
index 2e825c0d9..2e825c0d9 100644
--- a/kdesktop/kcustommenu.cc
+++ b/kdesktop/kcustommenu.cpp
diff --git a/kdesktop/kdesktop.kcfg b/kdesktop/kdesktop.kcfg
index 53a1cc781..71e008562 100644
--- a/kdesktop/kdesktop.kcfg
+++ b/kdesktop/kdesktop.kcfg
@@ -52,7 +52,7 @@
       <default>true</default>
       <label></label>
       <whatsthis></whatsthis>
-      <!-- init.cc:138 -->
+      <!-- init.cpp:138 -->
       <!--     if (!config->readBoolEntry("CopyDesktopLinks", true)) -->
     </entry>
     <entry key="AutoLineUpIcons" type="Bool">
@@ -64,9 +64,9 @@
       <default>false</default>
       <label>Sort directories first</label>
       <whatsthis></whatsthis>
-      <!-- krootwm.cc:251 -->
+      <!-- krootwm.cpp:251 -->
       <!--         aSortDirsFirst->setChecked( tdeconfig->readBoolEntry("SortDirectoriesFirst", true)); -->
-      <!-- krootwm.cc:496 -->
+      <!-- krootwm.cpp:496 -->
       <!--     config->writeEntry( "SortDirectoriesFirst", b ); -->
     </entry>
 		<entry key="TerminalApplication" type="Path">
@@ -85,7 +85,7 @@
       <default>Forward</default>
       <label></label>
       <whatsthis></whatsthis>
-      <!-- desktop.cc:397 -->
+      <!-- desktop.cpp:397 -->
       <!--             (config->readEntry("WheelDirection", default_dir_string) == forward_string) ? Forward : Reverse; -->
     </entry>
     <entry key="Left" type="String">
@@ -155,6 +155,16 @@
       <label>Align direction</label>
       <whatsthis>If this is enabled, icons are aligned vertically, otherwise horizontally.</whatsthis>
     </entry>
+    <entry key="IconSpacing" type="Int">
+      <default>5</default>
+      <label>Icon spacing</label>
+      <whatsthis><p>This is the minimal distance (in pixels) between the icons on your desktop.</p></whatsthis>
+    </entry>
+    <entry key="SpacingCtrlScroll" type="Bool">
+      <default>false</default>
+      <label>Change spacing by Ctrl+Mouse Scroll</label>
+      <whatsthis><p>If this is enabled, you can change desktop icon spacing by pressing Ctrl and scrolling on the desktop background.</p></whatsthis>
+    </entry>
     <entry key="Preview" type="StringList">
       <default></default>
       <label>Show Icon Previews For</label>
@@ -190,7 +200,7 @@
       <default></default>
       <label></label>
       <whatsthis></whatsthis>
-      <!-- kdiconview.cc:254 -->
+      <!-- kdiconview.cpp:254 -->
       <!--     m_itemsAlwaysFirst = config->readListEntry("AlwaysFirstItems"); // Distributor plug-in -->
     </entry>
   </group>
@@ -199,14 +209,14 @@
       <default>true</default>
       <label></label>
       <whatsthis></whatsthis>
-      <!-- kdiconview.cc:258 -->
+      <!-- kdiconview.cpp:258 -->
       <!--         m_enableMedia=config->readBoolEntry("enabled",false); -->
     </entry>
     <entry key="exclude" type="String">
       <default>media/nfs_mounted,media/nfs_unmounted,media/hdd_mounted,media/hdd_unmounted,media/floppy_unmounted,media/cdrom_unmounted,media/floppy5_unmounted</default>
       <label>Device Types to exclude</label>
       <whatsthis>The device types which you do not want to see on the desktop.</whatsthis>
-      <!-- kdiconview.cc:261 -->
+      <!-- kdiconview.cpp:261 -->
       <!--     TQString tmpList=config->readEntry("exclude","media/hdd_mounted,media/hdd_unmounted,media/floppy_unmounted,media/cdrom_unmounted,media/floppy5_unmounted"); -->
     </entry>
     <entry name="MediaFreeSpaceDisplayEnabled" key="FreeSpaceDisplayEnabled" type="Bool">
diff --git a/kdesktop/kdesktopSetAsBackground.desktop b/kdesktop/kdesktopSetAsBackground.desktop
index a7ba4f14a..3bc655803 100644
--- a/kdesktop/kdesktopSetAsBackground.desktop
+++ b/kdesktop/kdesktopSetAsBackground.desktop
@@ -1,14 +1,44 @@
 [Desktop Entry]
 X-TDE-ServiceTypes=image/*
-Actions=setAsBackground;tileAsBackground;
+Actions=centeredAsBackground;tiledAsBackground;centeredTiledAsBackground;centeredMaxpectAsBackground;tiledMaxpectAsBackground;scaledAsBackground;centeredAutoFitAsBackground;scaleAndCropAsBackground
 X-TDE-Submenu=Set as Background
 
-[Desktop Action setAsBackground]
+[Desktop Action centeredAsBackground]
 Name=Centered
 Icon=background
-Exec=dcop kdesktop KBackgroundIface setWallpaper %u 6
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 1
 
-[Desktop Action tileAsBackground]
+[Desktop Action tiledAsBackground]
 Name=Tiled
 Icon=background
 Exec=dcop kdesktop KBackgroundIface setWallpaper %u 2
+
+[Desktop Action centeredTiledAsBackground]
+Name=Center Tiled
+Icon=background
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 3
+
+[Desktop Action centeredMaxpectAsBackground]
+Name=Centered Maxpect
+Icon=background
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 4
+
+[Desktop Action tiledMaxpectAsBackground]
+Name=Tiled Maxpect
+Icon=background
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 5
+
+[Desktop Action scaledAsBackground]
+Name=Scaled
+Icon=background
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 6
+
+[Desktop Action centeredAutoFitAsBackground]
+Name=Centered Auto Fit
+Icon=background
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 7
+
+[Desktop Action scaleAndCropAsBackground]
+Name=Scale & Crop
+Icon=background
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 8
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cpp
index 86737ce3c..9e4f77931 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cpp
@@ -191,15 +191,13 @@ KDIconView::KDIconView( TQWidget *parent, const char* name )
 
     if (!m_bEditableDesktopIcons)
     {
-       setItemsMovable(false);
-       setAcceptDrops(false);
-       viewport()->setAcceptDrops(false);
+      setIconsLocked(true);
     }
 }
 
 KDIconView::~KDIconView()
 {
-    if (m_dotDirectory && !m_bEditableDesktopIcons) {
+    if (m_dotDirectory && !m_bEditableDesktopIcons || m_iconsLocked) {
       m_dotDirectory->rollback(false); // Don't save positions
     }
 
@@ -296,6 +294,7 @@ void KDIconView::initConfig( bool init )
     m_bVertAlign = KDesktopSettings::vertAlign();
     TQStringList oldPreview = previewSettings();
     setPreviewSettings( KDesktopSettings::preview() );
+    setSpacing( KDesktopSettings::iconSpacing() );
 
     // read arrange configuration
     m_eSortCriterion  = (SortCriterion)KDesktopSettings::sortCriterion();
@@ -486,6 +485,30 @@ void KDIconView::lineupIcons()
     saveIconPositions();
 }
 
+void KDIconView::incIconSpacing()
+{
+    if ( m_autoAlign && !KDesktopSettings::lockIcons() && KDesktopSettings::spacingCtrlScroll() )
+    {
+        setSpacing( ( spacing() + 1 ) );
+        lineupIcons();
+
+        KDesktopSettings::setIconSpacing( spacing() );
+        KDesktopSettings::writeConfig();
+    }
+}
+
+void KDIconView::decIconSpacing()
+{
+    if ( m_autoAlign && !KDesktopSettings::lockIcons() && KDesktopSettings::spacingCtrlScroll() && spacing() > 5 )
+    {
+        setSpacing( ( spacing() - 1 ) );
+        lineupIcons();
+
+        KDesktopSettings::setIconSpacing( spacing() );
+        KDesktopSettings::writeConfig();
+    }
+}
+
 void KDIconView::setAutoAlign( bool b )
 {
     m_autoAlign = b;
@@ -517,6 +540,15 @@ void KDIconView::setAutoAlign( bool b )
     }
 }
 
+void KDIconView::setIconsLocked( bool lock )
+{
+  m_iconsLocked = lock;
+
+  setItemsMovable(!lock);
+  setAcceptDrops(!lock);
+  viewport()->setAcceptDrops(!lock);
+}
+
 void KDIconView::startDirLister()
 {
     // if desktop is resized before start() is called (XRandr)
@@ -644,7 +676,22 @@ void KDIconView::wheelEvent( TQWheelEvent* e )
     TQIconViewItem *item = findItem( e->pos() );
     if ( !item )
     {
-      emit wheelRolled( e->delta() );
+      TQWheelEvent *we = TQT_TQWHEELEVENT(e);
+
+      if ( we->state() == ControlButton )
+      {
+        if ( we->delta() >= 0 )
+          incIconSpacing();
+        else
+          decIconSpacing();
+
+        we->accept();
+      }
+      else
+      {
+        emit wheelRolled( e->delta() );
+      }
+
       return;
     }
 
@@ -1726,25 +1773,25 @@ void KDIconView::viewportWheelEvent( TQWheelEvent * e )
 void KDIconView::updateWorkArea( const TQRect &wr )
 {
 	m_gotIconsArea = true;  // now we have it!
-	
+
 	if (( iconArea() == wr ) && (m_needDesktopAlign == false)) {
 		// nothing changed; avoid repaint/saveIconPosition ...
 		return;
 	}
-	
+
 	TQRect oldArea = iconArea();
 	setIconArea( wr );
-	
+
 	kdDebug(1204) << "KDIconView::updateWorkArea wr: " << wr.x() << "," << wr.y() << " " << wr.width() << "x" << wr.height() << endl;
 	kdDebug(1204) << "  oldArea:                     " << oldArea.x() << "," << oldArea.y() << " " << oldArea.width() << "x" << oldArea.height() << endl;
-	
+
 	bool needRepaint = false;
 	TQIconViewItem* item;
 	int dx, dy;
-	
+
 	dx = wr.left() - oldArea.left();
 	dy = wr.top() - oldArea.top();
-	
+
 	if ( dx != 0 || dy != 0 ) {
 		if ( (dx > 0) || (dy > 0) ) {
 			// the iconArea was shifted right/down; less space now
@@ -1762,14 +1809,14 @@ void KDIconView::updateWorkArea( const TQRect &wr )
 			// the iconArea was shifted left/up; more space now - use it
 			needRepaint = true;
 		}
-	
+
 		if ( needRepaint ) {
 			for ( item = firstItem(); item; item = item->nextItem() ) {
 				item->moveBy( dx, dy );
 			}
 		}
 	}
-	
+
 	for ( item = firstItem(); item; item = item->nextItem() ) {
 		TQRect r( item->rect() );
 		int dx = 0, dy = 0;
@@ -1789,7 +1836,7 @@ void KDIconView::updateWorkArea( const TQRect &wr )
 		repaint( FALSE );
 		saveIconPositions();
 	}
-	
+
 	m_needDesktopAlign = false;
 	lineupIcons();
 }
@@ -1861,18 +1908,18 @@ bool KDIconView::isFreePosition( const TQIconViewItem *item, const TQRect &curre
 	if (!area.contains(r, FALSE)) {
 		return false;
 	}
-	
+
 	TQIconViewItem *it = firstItem();
 	for (; it; it = it->nextItem() ) {
 		if ( !it->rect().isValid() || it == item ) {
 			continue;
 		}
-		
+
 		if ( it->intersects( r ) ) {
 			return false;
 		}
 	}
-	
+
 	return true;
 }
 
@@ -1891,12 +1938,12 @@ bool KDIconView::isFreePosition( const TQIconViewItem *item, const TQRect& rect,
 		if ( !rect.isValid() || it == item ) {
 			continue;
 		}
-		
+
 		if ( it->intersects( rect ) ) {
 			return false;
 		}
 	}
-	
+
 	return true;
 }
 
@@ -1921,12 +1968,12 @@ void KDIconView::moveToFreePosition(TQIconViewItem *item, const TQRect &currentI
 		m_lastDeletedIconPos = TQPoint();
 		return;
 	}
-	
+
 	//try to find a free place to put the item, honouring the m_bVertAlign property
 	TQRect rect=item->rect();
 	if (m_bVertAlign) {
 		kdDebug(1214)<<"moveToFreePosition for vertical alignment"<<endl;
-	
+
 		rect.moveTopLeft(TQPoint(currentIconArea.x()+spacing(),currentIconArea.y()+spacing()));
 		do {
 			success=false;
@@ -1939,7 +1986,7 @@ void KDIconView::moveToFreePosition(TQIconViewItem *item, const TQRect &currentI
 					break;
 				}
 			}
-		
+
 			if (!success) {
 				rect.moveTopLeft(TQPoint(rect.right()+spacing(),spacing()));
 			}
diff --git a/kdesktop/kdiconview.h b/kdesktop/kdiconview.h
index 7b20e1817..f3ebe6718 100644
--- a/kdesktop/kdiconview.h
+++ b/kdesktop/kdiconview.h
@@ -75,6 +75,7 @@ public:
 
     void lineupIcons(TQIconView::Arrangement);
 
+    void setIconsLocked( bool b );
     void setAutoAlign( bool b );
 
     TQStringList selectedURLs();
@@ -165,6 +166,9 @@ public slots:
     void slotClear();
     void refreshIcons();
 
+    void incIconSpacing();
+    void decIconSpacing();
+
 protected slots:
     void slotFreeSpaceOverlayStart();
     void slotFreeSpaceOverlayFinished();
@@ -214,6 +218,7 @@ private:
 
     bool m_bNeedRepaint;
     bool m_bNeedSave;
+    bool m_iconsLocked;
     bool m_autoAlign;
 
     /** true if even one icon has an icon-position entry in the .directory */
diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cpp
index 9c68fc740..62ee673e0 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cpp
@@ -1,5 +1,5 @@
 /*
- * krootwm.cc Part of the KDE project.
+ * krootwm.cpp Part of the KDE project.
  *
  * Copyright (C) 1997 Matthias Ettrich
  *           (C) 1997 Torben Weis, weis@kde.org
@@ -109,7 +109,7 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
      bookmarks = 0;
      bookmarkMenu = 0;
   }
-  
+
   // The windowList and desktop menus can be part of a menubar (Mac style)
   // so we create them here
   desktopMenu = new TQPopupMenu;
@@ -250,7 +250,7 @@ void KRootWm::initConfig()
   if ( m_bDesktopEnabled ) {
     m_pDesktop->iconView()->setAutoAlign( KDesktopSettings::autoLineUpIcons() );
     if ( kapp->authorize( "editable_desktop_icons" ) ) {
-        m_pDesktop->iconView()->setItemsMovable( !KDesktopSettings::lockIcons() );
+        m_pDesktop->iconView()->setIconsLocked( KDesktopSettings::lockIcons() );
         TDEToggleAction *aLockIcons = static_cast<TDEToggleAction*>(m_actionCollection->action("lock_icons"));
         if (aLockIcons)
             aLockIcons->setChecked( KDesktopSettings::lockIcons()  );
@@ -450,7 +450,7 @@ void KRootWm::buildMenus()
     TQPopupMenu* pWindowOperationsMenu = new TQPopupMenu;
     m_actionCollection->action("cascade")->plug( pWindowOperationsMenu );
     m_actionCollection->action("unclutter")->plug( pWindowOperationsMenu );
-    desktopMenu->insertItem(SmallIconSet("window_list"), i18n("Windows"), pWindowOperationsMenu);
+    desktopMenu->insertItem(SmallIconSet("window_duplicate"), i18n("Windows"), pWindowOperationsMenu);
 
     if (m_bDesktopEnabled)
     {
@@ -732,12 +732,24 @@ void KRootWm::slotLineupIcons() {
 
 void KRootWm::slotToggleLockIcons( bool lock )
 {
-    if (m_bDesktopEnabled)
-    {
-        m_pDesktop->iconView()->setItemsMovable( !lock );
-        KDesktopSettings::setLockIcons( lock );
-        KDesktopSettings::writeConfig();
-    }
+   KDesktopSettings::setLockIcons( lock );
+   KDesktopSettings::writeConfig();
+
+   // Also save it globally...
+   int desktop = TDEApplication::desktop()->primaryScreen();
+   TQCString cfilename;
+   if (desktop == 0)
+       cfilename = "kdesktoprc";
+   else
+       cfilename.sprintf("kdesktop-screen-%drc", desktop);
+
+   TDEConfig *kdg_config = new TDEConfig(cfilename, false, false);
+   kdg_config->setGroup( "General" );
+   kdg_config->writeEntry( "LockIcons", lock );
+   kdg_config->sync();
+   delete kdg_config;
+
+   m_pDesktop->iconView()->setIconsLocked( lock );
 }
 
 void KRootWm::slotRefreshDesktop() {
diff --git a/kdesktop/krootwm.h b/kdesktop/krootwm.h
index 8fb5af8b9..264f3eadb 100644
--- a/kdesktop/krootwm.h
+++ b/kdesktop/krootwm.h
@@ -80,7 +80,7 @@ public:
   static KRootWm * self() { return s_rootWm; }
 
   /**
-   * share this with desktop.cc
+   * share this with desktop.cpp
    */
   KNewMenu * newMenu() const { return menuNew; }
 
diff --git a/kdesktop/kwebdesktop/kwebdesktop.kcfg b/kdesktop/kwebdesktop/kwebdesktop.kcfg
index b0920f410..b9a1edbb5 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.kcfg
+++ b/kdesktop/kwebdesktop/kwebdesktop.kcfg
@@ -11,7 +11,7 @@
       <default>http://www.kde.org/</default>
       <label></label>
       <whatsthis></whatsthis>
-      <!-- kdiconview.cc:1103 -->
+      <!-- kdiconview.cpp:1103 -->
       <!--                  cfg.readEntry( "URL" ) == "trash:/" ) { -->
     </entry>
   </group>
diff --git a/kdesktop/lock/CMakeLists.txt b/kdesktop/lock/CMakeLists.txt
index 2bbe4b289..a394932e5 100644
--- a/kdesktop/lock/CMakeLists.txt
+++ b/kdesktop/lock/CMakeLists.txt
@@ -31,8 +31,8 @@ link_directories(
 set( target kdesktop_lock )
 
 set( ${target}_SRCS
-  lockprocess.cc lockdlg.cc infodlg.cc querydlg.cc sakdlg.cc
-  securedlg.cc autologout.cc main.cc
+  lockprocess.cpp lockdlg.cpp infodlg.cpp querydlg.cpp sakdlg.cpp
+  securedlg.cpp autologout.cpp main.cpp
 )
 
 tde_add_executable( ${target} AUTOMOC
diff --git a/kdesktop/lock/Makefile.am b/kdesktop/lock/Makefile.am
index 7713707e9..fd1bc1259 100644
--- a/kdesktop/lock/Makefile.am
+++ b/kdesktop/lock/Makefile.am
@@ -8,7 +8,7 @@ kdesktop_lock_LDADD    = ../libkdesktopsettings.la ../../tdmlib/libdmctl.la $(LI
 
 bin_PROGRAMS = kdesktop_lock
 
-kdesktop_lock_SOURCES = lockprocess.cc lockdlg.cc infodlg.cc querydlg.cc autologout.cc main.cc
+kdesktop_lock_SOURCES = lockprocess.cpp lockdlg.cpp infodlg.cpp querydlg.cpp autologout.cpp main.cpp
 
 noinst_HEADERS = lockprocess.h lockdlg.h infodlg.h querydlg.h autologout.h main.h
 
diff --git a/kdesktop/lock/autologout.cc b/kdesktop/lock/autologout.cpp
index 7d6bf6ff1..7d6bf6ff1 100644
--- a/kdesktop/lock/autologout.cc
+++ b/kdesktop/lock/autologout.cpp
diff --git a/kdesktop/lock/infodlg.cc b/kdesktop/lock/infodlg.cpp
index d248d7bd0..d248d7bd0 100644
--- a/kdesktop/lock/infodlg.cc
+++ b/kdesktop/lock/infodlg.cpp
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cpp
index 763d7bf95..763d7bf95 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cpp
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cpp
index 67492ea3c..67492ea3c 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cpp
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cpp
index c5993f4ac..c5993f4ac 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cpp
diff --git a/kdesktop/lock/querydlg.cc b/kdesktop/lock/querydlg.cpp
index 7618a5062..7618a5062 100644
--- a/kdesktop/lock/querydlg.cc
+++ b/kdesktop/lock/querydlg.cpp
diff --git a/kdesktop/lock/sakdlg.cc b/kdesktop/lock/sakdlg.cpp
index a062fb0fe..a062fb0fe 100644
--- a/kdesktop/lock/sakdlg.cc
+++ b/kdesktop/lock/sakdlg.cpp
diff --git a/kdesktop/lock/securedlg.cc b/kdesktop/lock/securedlg.cpp
index b38378f2e..b38378f2e 100644
--- a/kdesktop/lock/securedlg.cc
+++ b/kdesktop/lock/securedlg.cpp
diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cpp
index 52826bf24..52826bf24 100644
--- a/kdesktop/lockeng.cc
+++ b/kdesktop/lockeng.cpp
diff --git a/kdesktop/main.cc b/kdesktop/main.cpp
index b54c03cb7..b54c03cb7 100644
--- a/kdesktop/main.cc
+++ b/kdesktop/main.cpp
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index 80387aca1..2029fda59 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -1094,6 +1094,3 @@ void Minicli::fontChange( const TQFont & )
 {
    adjustSize();
 }
-
-// vim: set et ts=2 sts=2 sw=2:
-
diff --git a/kdesktop/minicli_ui.ui b/kdesktop/minicli_ui.ui
index 13d3b9736..93c95c8f0 100644
--- a/kdesktop/minicli_ui.ui
+++ b/kdesktop/minicli_ui.ui
@@ -640,21 +640,14 @@
 </tabstops>
 <includes>
     <include location="global" impldecl="in declaration">fixx11h.h</include>
+    <include location="local" impldecl="in implementation">kcombobox.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
     <include location="local" impldecl="in implementation">kiconloader.h</include>
-    <include location="local" impldecl="in implementation">kpassdlg.h</include>
-    <include location="local" impldecl="in implementation">kcombobox.h</include>
     <include location="local" impldecl="in implementation">klineedit.h</include>
+    <include location="local" impldecl="in implementation">kpassdlg.h</include>
     <include location="local" impldecl="in implementation">kpushbutton.h</include>
 </includes>
 <pixmapfunction>BarIcon</pixmapfunction>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpassdlg.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
 </UI>
diff --git a/kdesktop/pixmapserver.cc b/kdesktop/pixmapserver.cpp
index 7a480cdb6..56224f37a 100644
--- a/kdesktop/pixmapserver.cc
+++ b/kdesktop/pixmapserver.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * This file is part of the KDE project, module kdesktop.
  * Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
diff --git a/kdesktop/pixmapserver.h b/kdesktop/pixmapserver.h
index 3084cd0a3..a0eadcdd6 100644
--- a/kdesktop/pixmapserver.h
+++ b/kdesktop/pixmapserver.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * This file is part of the KDE project, module kdesktop.
  * Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
diff --git a/kdesktop/xautolock.cc b/kdesktop/xautolock.cpp
index 3c7e62670..3c7e62670 100644
--- a/kdesktop/xautolock.cc
+++ b/kdesktop/xautolock.cpp