krazy fixes for includes

svn path=/trunk/KDE/kdebase/kdepasswd/; revision=660766

kdepasswd/kcm/chfacedlg.cpp

@@ -25,6 +25,7 @@
  * @author Braden MacDonald
  */
 
+#include "chfacedlg.h"
 
 #include <QLayout>
 #include <QLabel>
@@ -46,7 +47,6 @@
 #include <konq_operations.h>
 #include <kurl.h>
 
-#include "chfacedlg.h"
 #include "settings.h" // KConfigXT
 
 

kdepasswd/kcm/chfacedlg.h

@@ -1,6 +1,6 @@
 /**
- *  Copyright 2003 Braden MacDonald <bradenm_k@shaw.ca>                   
- *  Copyright 2003 Ravikiran Rajagopal <ravi@ee.eng.ohio-state.edu>       
+ *  Copyright 2003 Braden MacDonald <bradenm_k@shaw.ca>
+ *  Copyright 2003 Ravikiran Rajagopal <ravi@ee.eng.ohio-state.edu>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -31,10 +31,10 @@
 #include <QObject>
 #include <QPixmap>
 
-#include <kdialog.h>
-#include <k3iconview.h> // declaration below
+#include <KDialog>
+#include <K3IconView> // declaration below
 
-enum FacePerm { adminOnly = 1, adminFirst = 2, userFirst = 3, userOnly = 4}; 
+enum FacePerm { adminOnly = 1, adminFirst = 2, userFirst = 3, userOnly = 4};
 
 class ChFaceDlg : public KDialog
 {
@@ -45,7 +45,7 @@ public:
   ChFaceDlg(const QString& picsdirs, QWidget *parent=0, const char *name=0, bool modal=true);
 
 
-  QPixmap getFaceImage() const 
+  QPixmap getFaceImage() const
   {
     if(m_FacesWidget->currentItem())
       return *(m_FacesWidget->currentItem()->pixmap());

kdepasswd/kcm/chfnprocess.cpp

@@ -13,12 +13,13 @@
  * derived from kdepasswd.
  */
 
+#include "chfnprocess.h"
+
 #include <unistd.h>
 #include <stdlib.h>
 
 #include <kdesu/process.h>
 #include <kdebug.h>
-#include "chfnprocess.h"
 
 
 int ChfnProcess::exec(const char *pass, const char *name)

kdepasswd/kcm/main.cpp

@@ -20,13 +20,14 @@
  *
  */
 
+#include "main.h"
+
 #include <QLayout>
 #include <QLabel>
 #include <QLineEdit>
 #include <QEvent>
 #include <QPixmap>
 #include <QStringList>
-#include <QLayout>
 //Added by qt3to4:
 #include <QDragEnterEvent>
 #include <QVBoxLayout>
@@ -34,7 +35,6 @@
 
 #include <kpushbutton.h>
 #include <kguiitem.h>
-#include <kemailsettings.h>
 #include <kpassworddialog.h>
 #include <kuser.h>
 #include <kdialog.h>
@@ -52,8 +52,6 @@
 #include "settings.h"
 #include "pass.h"
 #include "chfnprocess.h"
-#include "chfacedlg.h"
-#include "main.h"
 
 typedef KGenericFactory<KCMUserAccount, QWidget> Factory;
 K_EXPORT_COMPONENT_FACTORY( useraccount, Factory("useraccount") )

kdepasswd/kcm/main.h

@@ -20,6 +20,7 @@
 #define MAIN_H
 
 #include <kcmodule.h>
+#include <kemailsettings.h>
 
 #include "ui_main_widget.h"
 //Added by qt3to4:
@@ -27,9 +28,10 @@
 #include <QEvent>
 #include <QDropEvent>
 
+#include "chfacedlg.h"
+
 class KAboutData;
 class KUser;
-class KEmailSettings;
 class QEvent;
 class QObject;
 class KUrl;

kdepasswd/passwd.cpp

@@ -4,10 +4,12 @@
  *
  * This file is part of the KDE project, module kdesu.
  * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
- * 
+ *
  * passwd.cpp: Change a user's password.
  */
 
+#include "passwd.h"
+
 #include <config.h> // setenv
 
 #include <stdio.h>
@@ -27,7 +29,6 @@
 #include <kstandarddirs.h>
 
 #include <kdesu/process.h>
-#include "passwd.h"
 
 
 PasswdProcess::PasswdProcess(QByteArray user)

kdepasswd/passwddlg.cpp

@@ -6,12 +6,12 @@
  * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
  */
 
+#include "passwddlg.h"
+#include "passwd.h"
+
 #include <klocale.h>
 #include <kmessagebox.h>
 
-#include "passwd.h"
-#include "passwddlg.h"
-
 KDEpasswd1Dialog::KDEpasswd1Dialog()
     : KPasswordDialog()
 {

kdepasswd/passwddlg.h

@@ -26,7 +26,7 @@ public:
 
     void accept();
 };
-    
+
 
 class KDEpasswd2Dialog
     : public KNewPasswordDialog
@@ -42,12 +42,12 @@ public:
 
 protected:
     bool checkPassword(const char *password);
-    
+
 private:
     const char *m_Pass;
     QByteArray m_User;
 };
-    
+
 
 
 #endif // __PasswdDlg_h_Incluced__