EBN fixes (includes, typos etc.

svn path=/trunk/KDE/kdebase/apps/; revision=669964

kdialog/klistboxdialog.cpp

@@ -16,14 +16,13 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
+#include "klistboxdialog.h"
+#include "klistboxdialog.moc"
 
 #include <QtGui/QLabel>
 #include <Qt3Support/Q3ListBox>
 #include <kvbox.h>
 
-#include "klistboxdialog.h"
-#include "klistboxdialog.moc"
-
 #include "klocale.h"
 
 KListBoxDialog::KListBoxDialog(const QString &text, QWidget *parent)

kdialog/klistboxdialog.h

@@ -25,6 +25,8 @@
 
 #include <Qt3Support/Q3ListBox>
 
+class QLabel;
+
 class KListBoxDialog : public KDialog
 {
   Q_OBJECT

kfind/kdatecombo.cpp

@@ -3,6 +3,9 @@
  *  kdatecombo.cpp
  *
  ***********************************************************************/
+#include "kdatecombo.h"
+
+#include "kdatecombo.moc"
 
 #include <QtCore/QTimer>
 //Added by qt3to4:
@@ -15,10 +18,6 @@
 #include <kdatetable.h>
 #include <kdebug.h>
 
-#include "kdatecombo.h"
-
-#include "kdatecombo.moc"
-
 KDateCombo::KDateCombo(QWidget *parent) : QComboBox(parent)
 {
   setEditable( false );

kfind/kfinddlg.cpp

@@ -3,6 +3,8 @@
  *  Kfinddlg.cpp
  *
  **********************************************************************/
+#include "kfinddlg.h"
+#include "kfinddlg.moc"
 
 #include <QtGui/QLayout>
 #include <QtGui/QPushButton>
@@ -20,9 +22,6 @@
 #include "kquery.h"
 #include "kfwin.h"
 
-#include "kfinddlg.h"
-#include "kfinddlg.moc"
-
 KfindDlg::KfindDlg(const KUrl & url, QWidget *parent)
   : KDialog( parent )
 {

kfind/kfinddlg.h

@@ -12,6 +12,7 @@
 #include <kdirwatch.h>
 
 class QString;
+class QDir;
 
 class KQuery;
 class KUrl;

kfind/kfindpart.cpp

@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kfind.h"
 #include "kfindpart.h"
+#include "kfind.h"
 #include "kquery.h"
 
 #include <kparts/genericfactory.h>

kfind/kfindpart.h

@@ -37,6 +37,7 @@ class KActionMenu;
 class QIconViewItem;
 class IconViewBrowserExtension;
 //end added
+class Kfind;
 
 class KFindPart : public KonqDirPart//KParts::ReadOnlyPart
 {

kfind/kftabdlg.cpp

@@ -3,6 +3,7 @@
  *  kftabdlg.cpp
  *
  **********************************************************************/
+#include "kftabdlg.h"
 
 #include <QtGui/QButtonGroup>
 #include <QtGui/QRadioButton>
@@ -30,7 +31,6 @@
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include "kquery.h"
-#include "kftabdlg.h"
 // Static utility functions
 static void save_pattern(QComboBox *, const QString &, const QString &);
 

kfind/kfwin.cpp

@@ -3,6 +3,9 @@
  *  Kfwin.cpp
  *
  **********************************************************************/
+#include "kfwin.h"
+
+#include "kfwin.moc"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -40,10 +43,6 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 
-#include "kfwin.h"
-
-#include "kfwin.moc"
-
 template class Q3PtrList<KfFileLVI>;
 
 // Permission strings

kfind/kquery.cpp

@@ -1,3 +1,5 @@
+#include "kquery.h"
+
 #include <stdlib.h>
 
 #include <QtCore/QFileInfo>
@@ -12,8 +14,6 @@
 #include <kstandarddirs.h>
 #include <kzip.h>
 
-#include "kquery.h"
-
 KQuery::KQuery(QObject *parent)
   : QObject(parent),
     m_sizemode(0), m_sizeboundary1(0), m_sizeboundary2(0),

konqueror/konq_mainwindow.cc

@@ -1417,7 +1417,7 @@ void KonqMainWindow::slotOpenLocation()
   // Don't pre-fill the url, as it is auto-selected and thus overwrites the
   // X clipboard, making it impossible to paste in the url you really wanted.
   // Another example of why the X clipboard sux
-  KUrlRequesterDialog dlg( QString::null, this );
+  KUrlRequesterDialog dlg( QString(), this );
   dlg.setCaption( i18n("Open Location") );
   // Set current directory for relative paths.
   // Testcase: konqueror www.kde.org; Ctrl+O; file in $HOME; would open http://$file

konqueror/konq_misc.cc

@@ -16,6 +16,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
+#include "konq_misc.h"
 
 #include <QtGui/QStyle>
 #include <QtCore/QDir>
@@ -34,7 +35,6 @@
 #include <kstartupinfo.h>
 #include <kiconloader.h>
 
-#include "konq_misc.h"
 #include "konq_mainwindow.h"
 #include "konq_viewmgr.h"
 #include "konq_view.h"

konqueror/listview/konq_infolistviewitem.cc

@@ -100,7 +100,7 @@ void KonqInfoListViewItem::updateContents()
             if ( static_cast<KonqBaseListViewWidget *>(listView())->m_pSettings->fileSizeInBytes() )
                 setText(tmpColumn->displayInColumn,KGlobal::locale()->formatNumber( m_fileitem->size(),0)+' ');
             else
-                setText(tmpColumn->displayInColumn,KIO::convertSize(m_fileitem->size())+" ");
+                setText(tmpColumn->displayInColumn,KIO::convertSize(m_fileitem->size())+' ');
             break;
          case KIO::UDS_ACCESS:
             setText(tmpColumn->displayInColumn,makeAccessString(m_fileitem->permissions()));

konqueror/remoteencodingplugin/kremoteencodingplugin.cpp

@@ -24,6 +24,8 @@
  * Distributed under the same terms.
  */
 
+#include "kremoteencodingplugin.h"
+
 #include <kdebug.h>
 #include <kactionmenu.h>
 #include <kactioncollection.h>
@@ -41,8 +43,6 @@
 #include <konq_dirpart.h>
 #include <kparts/browserextension.h>
 
-#include "kremoteencodingplugin.h"
-
 #define DATA_KEY	QLatin1String("Charset")
 
 KRemoteEncodingPlugin::KRemoteEncodingPlugin(QObject * parent,

nsplugins/nspluginloader.cpp

@@ -23,6 +23,8 @@
 
 */
 
+#include "nspluginloader.h"
+#include "nspluginloader.moc"
 
 #include <QDir>
 #include <QGridLayout>
@@ -43,9 +45,6 @@
 #include <QTextStream>
 #include <QRegExp>
 
-#include "nspluginloader.h"
-#include "nspluginloader.moc"
-
 #include "nsplugins_class_interface.h"
 #include "nsplugins_instance_interface.h"
 #include "nsplugins_viewer_interface.h"

nsplugins/plugin_part.cpp

@@ -20,9 +20,9 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
+#include "plugin_part.h"
 #include "nspluginloader.h"
 #include "callbackadaptor.h"
-#include "plugin_part.h"
 
 #include <kaboutdata.h>
 #include <kaction.h>

nsplugins/sdk/npapi.h

@@ -130,7 +130,7 @@
 
 
 /* The OS/2 version of Netscape uses RC_DATA to define the
-   mime types, file extentions, etc that are required.
+   mime types, file extensions, etc that are required.
    Use a vertical bar to separate types, end types with \0.
    FileVersion and ProductVersion are 32bit ints, all other
    entries are strings the MUST be terminated wwith a \0.
@@ -428,7 +428,7 @@ typedef struct _NPWindow
   NPRect clipRect; /* Clipping rectangle in port coordinates */
                    /* Used by MAC only.			  */
 #if defined(XP_UNIX) && !defined(XP_MACOSX)
-  void * ws_info; /* Platform-dependent additonal data */
+  void * ws_info; /* Platform-dependent additional data */
 #endif /* XP_UNIX */
   NPWindowType type; /* Is this a window or a drawable? */
 } NPWindow;

nsplugins/sdk/npupp.h

@@ -1166,7 +1166,7 @@ typedef NPError (* NP_LOADDS NPP_MainEntryUPP)(NPNetscapeFuncs*, NPPluginFuncs*,
 
 /*
  * Mac version(s) of NP_GetMIMEDescription(const char *)
- * These can be called to retreive MIME information from the plugin dynamically
+ * These can be called to retrieve MIME information from the plugin dynamically
  *
  * Note: For compatibility with Quicktime, BPSupportedMIMEtypes is another way
  *       to get mime info from the plugin only on OSX and may not be supported 

nsplugins/viewer/qxteventloop.cpp

@@ -33,10 +33,11 @@
 **
 **********************************************************************/
 
+#include "qxteventloop.h"
+
 #include <config.h>
 
 #include <QApplication>
-#include "qxteventloop.h"
 #include <kglobal.h>
 
 #include <qwidgetintdict.h>

nsplugins/viewer/qxteventloop.h

@@ -52,7 +52,7 @@ class QXtEventLoop : public QEventLoop
     Q_OBJECT
 
 public:
-    QXtEventLoop( const char *applicationClass, XtAppContext context = NULL, XrmOptionDescRec *options = 0, int numOptions = 0);
+    explicit QXtEventLoop( const char *applicationClass, XtAppContext context = NULL, XrmOptionDescRec *options = 0, int numOptions = 0);
     ~QXtEventLoop();
 
     XtAppContext applicationContext() const;