[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-devel
Subject: Some EBN fixes...
From: "Max Blazejak" <m43ksrocks () gmail ! com>
Date: 2007-05-29 12:45:32
Message-ID: 9dd8fd8b0705290545s4db5fc50g52c4bee9dc351dea () mail ! gmail ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Hi everyone,
attached is patch that fixes some EBN errors for kdebase/apps (mostly
"include own header first")
So please have a look at it and commit, if it's ok.
Regards,
Max
[Attachment #5 (text/html)]
Hi everyone,<br><br>attached is patch that fixes some EBN errors for kdebase/apps \
(mostly "include own header first")<br>So please have a look at it and \
commit, if it's ok.<br><br>Regards,<br><br>Max<br>
["EBN_kdebase_app.diff" (text/x-patch)]
Index: apps/nsplugins/sdk/npupp.h
===================================================================
--- apps/nsplugins/sdk/npupp.h (Revision 669444)
+++ apps/nsplugins/sdk/npupp.h (Arbeitskopie)
@@ -1166,7 +1166,7 @@ typedef NPError (* NP_LOADDS NPP_MainEnt
/*
* 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
Index: apps/nsplugins/sdk/npapi.h
===================================================================
--- apps/nsplugins/sdk/npapi.h (Revision 669444)
+++ apps/nsplugins/sdk/npapi.h (Arbeitskopie)
@@ -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;
Index: apps/nsplugins/viewer/qxteventloop.cpp
===================================================================
--- apps/nsplugins/viewer/qxteventloop.cpp (Revision 669444)
+++ apps/nsplugins/viewer/qxteventloop.cpp (Arbeitskopie)
@@ -33,10 +33,11 @@
**
**********************************************************************/
+#include "qxteventloop.h"
+
#include <config.h>
#include <QApplication>
-#include "qxteventloop.h"
#include <kglobal.h>
#include <qwidgetintdict.h>
Index: apps/nsplugins/viewer/qxteventloop.h
===================================================================
--- apps/nsplugins/viewer/qxteventloop.h (Revision 669444)
+++ apps/nsplugins/viewer/qxteventloop.h (Arbeitskopie)
@@ -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;
Index: apps/nsplugins/plugin_part.cpp
===================================================================
--- apps/nsplugins/plugin_part.cpp (Revision 669444)
+++ apps/nsplugins/plugin_part.cpp (Arbeitskopie)
@@ -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>
Index: apps/nsplugins/nspluginloader.cpp
===================================================================
--- apps/nsplugins/nspluginloader.cpp (Revision 669444)
+++ apps/nsplugins/nspluginloader.cpp (Arbeitskopie)
@@ -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"
Index: apps/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
===================================================================
--- apps/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp (Revision 669444)
+++ apps/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp (Arbeitskopie)
@@ -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,
Index: apps/konqueror/listview/konq_infolistviewitem.cc
===================================================================
--- apps/konqueror/listview/konq_infolistviewitem.cc (Revision 669444)
+++ apps/konqueror/listview/konq_infolistviewitem.cc (Arbeitskopie)
@@ -100,7 +100,7 @@ void KonqInfoListViewItem::updateContent
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()));
Index: apps/konqueror/konq_mainwindow.cc
===================================================================
--- apps/konqueror/konq_mainwindow.cc (Revision 669444)
+++ apps/konqueror/konq_mainwindow.cc (Arbeitskopie)
@@ -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
Index: apps/konqueror/konq_misc.cc
===================================================================
--- apps/konqueror/konq_misc.cc (Revision 669444)
+++ apps/konqueror/konq_misc.cc (Arbeitskopie)
@@ -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"
Index: apps/kdialog/klistboxdialog.cpp
===================================================================
--- apps/kdialog/klistboxdialog.cpp (Revision 669444)
+++ apps/kdialog/klistboxdialog.cpp (Arbeitskopie)
@@ -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)
Index: apps/kdialog/klistboxdialog.h
===================================================================
--- apps/kdialog/klistboxdialog.h (Revision 669444)
+++ apps/kdialog/klistboxdialog.h (Arbeitskopie)
@@ -25,6 +25,8 @@
#include <Qt3Support/Q3ListBox>
+class QLabel;
+
class KListBoxDialog : public KDialog
{
Q_OBJECT
Index: apps/konsole/src/old/konsole.cpp
===================================================================
--- apps/konsole/src/old/konsole.cpp (Revision 669444)
+++ apps/konsole/src/old/konsole.cpp (Arbeitskopie)
@@ -1230,7 +1230,7 @@ bool Konsole::queryClose()
*/
//Implementation note: setColLin() works by intructing the terminal display widget
-//to resize itself to accomodate the specified number of lines and columns, and then \
resizes +//to resize itself to accommodate the specified number of lines and columns, \
and then resizes //the Konsole window to its sizeHint().
void Konsole::setColLin(int columns, int lines)
Index: apps/kfind/kdatecombo.cpp
===================================================================
--- apps/kfind/kdatecombo.cpp (Revision 669444)
+++ apps/kfind/kdatecombo.cpp (Arbeitskopie)
@@ -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 );
Index: apps/kfind/kftabdlg.cpp
===================================================================
--- apps/kfind/kftabdlg.cpp (Revision 669444)
+++ apps/kfind/kftabdlg.cpp (Arbeitskopie)
@@ -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 &);
Index: apps/kfind/kfwin.cpp
===================================================================
--- apps/kfind/kfwin.cpp (Revision 669444)
+++ apps/kfind/kfwin.cpp (Arbeitskopie)
@@ -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
Index: apps/kfind/kquery.cpp
===================================================================
--- apps/kfind/kquery.cpp (Revision 669444)
+++ apps/kfind/kquery.cpp (Arbeitskopie)
@@ -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),
Index: apps/kfind/kfinddlg.cpp
===================================================================
--- apps/kfind/kfinddlg.cpp (Revision 669444)
+++ apps/kfind/kfinddlg.cpp (Arbeitskopie)
@@ -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 )
{
Index: apps/kfind/kfindpart.cpp
===================================================================
--- apps/kfind/kfindpart.cpp (Revision 669444)
+++ apps/kfind/kfindpart.cpp (Arbeitskopie)
@@ -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>
Index: apps/kfind/kfinddlg.h
===================================================================
--- apps/kfind/kfinddlg.h (Revision 669444)
+++ apps/kfind/kfinddlg.h (Arbeitskopie)
@@ -12,6 +12,7 @@
#include <kdirwatch.h>
class QString;
+class QDir;
class KQuery;
class KUrl;
Index: apps/kfind/kfindpart.h
===================================================================
--- apps/kfind/kfindpart.h (Revision 669444)
+++ apps/kfind/kfindpart.h (Arbeitskopie)
@@ -37,6 +37,7 @@ class KActionMenu;
class QIconViewItem;
class IconViewBrowserExtension;
//end added
+class Kfind;
class KFindPart : public KonqDirPart//KParts::ReadOnlyPart
{
>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic