[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepim/kaddressbook/xxport
From: Bertjan Broeksema <b.broeksema () home ! nl>
Date: 2008-12-11 19:45:25
Message-ID: 1229024725.857210.10690.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 895803 by bbroeksema:
- krazy fixes: proper include directives
- header cleanup (see r893053).
M +4 -4 bookmark_xxport.cpp
M +2 -2 csv_xxport.cpp
M +2 -0 csv_xxport.h
M +4 -3 csvimportdialog.cpp
M +4 -3 csvimportdialog.h
M +3 -4 eudora_xxport.cpp
M +4 -5 gmx_xxport.cpp
M +2 -0 gmx_xxport.h
M +5 -3 gnokii_xxport.cpp
M +2 -2 kde2_xxport.cpp
M +5 -6 ldif_xxport.cpp
M +2 -0 ldif_xxport.h
M +3 -4 opera_xxport.cpp
M +2 -2 pab_mapihd.h
M +2 -1 pab_pablib.h
M +2 -2 pab_xxport.cpp
M +2 -0 pab_xxport.h
M +4 -3 vcard_xxport.cpp
--- trunk/KDE/kdepim/kaddressbook/xxport/bookmark_xxport.cpp #895802:895803
@@ -22,16 +22,16 @@
without including the source code for Qt in the source distribution.
*/
+#include "bookmark_xxport.h"
+
#include <kbookmark.h>
+#include <kbookmarkdombuilder.h>
#include <kbookmarkmanager.h>
#include <kbookmarkmenu.h>
+#include <klocale.h>
#include <konqbookmarkmenu.h>
-#include <kbookmarkdombuilder.h>
-#include <klocale.h>
#include <kstandarddirs.h>
-#include "bookmark_xxport.h"
-
K_EXPORT_KADDRESSBOOK_XXFILTER( kaddrbk_bookmark_xxport, BookmarkXXPort )
BookmarkXXPort::BookmarkXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name )
--- trunk/KDE/kdepim/kaddressbook/xxport/csv_xxport.cpp #895802:895803
@@ -21,6 +21,8 @@
without including the source code for Qt in the source distribution.
*/
+#include "csv_xxport.h"
+
#include <QtCore/QFile>
#include <QtCore/QTextStream>
@@ -33,8 +35,6 @@
#include "csvimportdialog.h"
-#include "csv_xxport.h"
-
K_EXPORT_KADDRESSBOOK_XXFILTER( kaddrbk_csv_xxport, CSVXXPort )
CSVXXPort::CSVXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name )
--- trunk/KDE/kdepim/kaddressbook/xxport/csv_xxport.h #895802:895803
@@ -26,6 +26,8 @@
#include <xxport.h>
+class QFile;
+
class CSVXXPort : public KAB::XXPort
{
Q_OBJECT
--- trunk/KDE/kdepim/kaddressbook/xxport/csvimportdialog.cpp #895802:895803
@@ -35,20 +35,21 @@
#include <QtGui/QScrollBar>
#include <QtGui/QTableWidget>
-#include <kprogressdialog.h>
+#include <kabc/addressbook.h>
#include <kapplication.h>
#include <kdebug.h>
#include <kdialog.h>
#include <kfiledialog.h>
+#include <kinputdialog.h>
#include <klineedit.h>
#include <klocale.h>
-#include <kinputdialog.h>
#include <kmessagebox.h>
+#include <kprogressdialog.h>
#include <kstandarddirs.h>
#include <kurlrequester.h>
+#include "comboboxheaderview.h"
#include "dateparser.h"
-#include "comboboxheaderview.h"
enum { Local = 0, Guess = 1, Latin1 = 2, Uni = 3, MSBug = 4, Codec = 5 };
--- trunk/KDE/kdepim/kaddressbook/xxport/csvimportdialog.h #895802:895803
@@ -19,15 +19,16 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef KADDRESSBOOK_CVSIMPORTDIALOG_H
-#define KADDRESSBOOK_CVSIMPORTDIALOG_H
+#ifndef KADDRESSBOOK_CSVIMPORTDIALOG_H
+#define KADDRESSBOOK_CSVIMPORTDIALOG_H
-#include <kabc/addressbook.h>
#include <kabc/addresseelist.h>
#include <kdialog.h>
#include <QtCore/QList>
+namespace KABC { class AddressBook; }
+
class KUrlRequester;
class QButtonGroup;
--- trunk/KDE/kdepim/kaddressbook/xxport/eudora_xxport.cpp #895802:895803
@@ -21,9 +21,12 @@
without including the source code for Qt in the source distribution.
*/
+#include "eudora_xxport.h"
+
#include <QtCore/QFile>
#include <QtCore/QTextStream>
+#include <kdebug.h>
#include <kfiledialog.h>
#include <kio/netaccess.h>
#include <klocale.h>
@@ -31,10 +34,6 @@
#include <ktemporaryfile.h>
#include <kurl.h>
-#include <kdebug.h>
-
-#include "eudora_xxport.h"
-
#define CTRL_C 3
K_EXPORT_KADDRESSBOOK_XXFILTER( kaddrbk_eudora_xxport, EudoraXXPort )
--- trunk/KDE/kdepim/kaddressbook/xxport/gmx_xxport.cpp #895802:895803
@@ -29,22 +29,21 @@
For further information please visit http://www.gmx.com
*/
+#include "gmx_xxport.h"
+
#include <QtCore/QFile>
#include <QtCore/QMap>
#include <QtCore/QTextStream>
+#include <kcodecs.h>
+#include <kdebug.h>
#include <kfiledialog.h>
#include <kio/netaccess.h>
#include <klocale.h>
-#include <kcodecs.h>
#include <kmessagebox.h>
#include <ktemporaryfile.h>
#include <kurl.h>
-#include <kdebug.h>
-
-#include "gmx_xxport.h"
-
K_EXPORT_KADDRESSBOOK_XXFILTER_CATALOG( kaddrbk_gmx_xxport, GMXXXPort, "kaddrbk_gmx_xxport" )
#define GMX_FILESELECTION_STRING "*.gmxa|" + i18n( "GMX addressbook file (*.gmxa)" )
--- trunk/KDE/kdepim/kaddressbook/xxport/gmx_xxport.h #895802:895803
@@ -27,6 +27,8 @@
#include <xxport.h>
+class QFile;
+
class GMXXXPort : public KAB::XXPort
{
Q_OBJECT
--- trunk/KDE/kdepim/kaddressbook/xxport/gnokii_xxport.cpp #895802:895803
@@ -30,15 +30,19 @@
- create a log file and give user possibility to see it afterwards
- handle callergroup value (Friend, VIP, Family, ...) better
*/
+
+#include "gnokii_xxport.h"
+
#include <config-xxport.h>
#include <QtGui/QProgressBar>
#include <kdebug.h>
+#include <kguiitem.h>
#include <klocale.h>
#include <kmessagebox.h>
-#include <kguiitem.h>
#include <kprogressdialog.h>
+
#ifdef HAVE_GNOKII_H
extern "C" {
#include <gnokii.h>
@@ -49,8 +53,6 @@
#endif
#endif
-#include "gnokii_xxport.h"
-
#define APP "GNOKII_XXPORT"
#if 1 // !defined(NDEBUG)
--- trunk/KDE/kdepim/kaddressbook/xxport/kde2_xxport.cpp #895802:895803
@@ -21,6 +21,8 @@
without including the source code for Qt in the source distribution.
*/
+#include "kde2_xxport.h"
+
#include <QtCore/QFile>
#include <kdebug.h>
@@ -35,8 +37,6 @@
#include "xxportmanager.h"
-#include "kde2_xxport.h"
-
K_EXPORT_KADDRESSBOOK_XXFILTER( kaddrbk_kde2_xxport, KDE2XXPort )
KDE2XXPort::KDE2XXPort( KABC::AddressBook *ab, QWidget *parent, const char *name )
--- trunk/KDE/kdepim/kaddressbook/xxport/ldif_xxport.cpp #895802:895803
@@ -33,22 +33,21 @@
into your KDE Addressbook.
*/
+#include "ldif_xxport.h"
+
#include <QtCore/QFile>
#include <QtCore/QTextStream>
+#include <kabc/ldifconverter.h>
+#include <kcodecs.h>
+#include <kdebug.h>
#include <kfiledialog.h>
#include <kio/netaccess.h>
#include <klocale.h>
-#include <kcodecs.h>
#include <kmessagebox.h>
#include <ktemporaryfile.h>
#include <kurl.h>
-#include <kabc/ldifconverter.h>
-#include <kdebug.h>
-
-#include "ldif_xxport.h"
-
K_EXPORT_KADDRESSBOOK_XXFILTER( kaddrbk_ldif_xxport, LDIFXXPort )
LDIFXXPort::LDIFXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name )
--- trunk/KDE/kdepim/kaddressbook/xxport/ldif_xxport.h #895802:895803
@@ -27,6 +27,8 @@
#include <xxport.h>
+class QFile;
+
class LDIFXXPort : public KAB::XXPort
{
Q_OBJECT
--- trunk/KDE/kdepim/kaddressbook/xxport/opera_xxport.cpp #895802:895803
@@ -22,10 +22,13 @@
without including the source code for Qt in the source distribution.
*/
+#include "opera_xxport.h"
+
#include <QtCore/QFile>
#include <QtCore/QRegExp>
#include <QtCore/QTextStream>
+#include <kdebug.h>
#include <kfiledialog.h>
#include <kio/netaccess.h>
#include <klocale.h>
@@ -33,10 +36,6 @@
#include <ktemporaryfile.h>
#include <kurl.h>
-#include <kdebug.h>
-
-#include "opera_xxport.h"
-
K_EXPORT_KADDRESSBOOK_XXFILTER( kaddrbk_opera_xxport, OperaXXPort )
OperaXXPort::OperaXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name )
--- trunk/KDE/kdepim/kaddressbook/xxport/pab_mapihd.h #895802:895803
@@ -15,8 +15,8 @@
* *
***************************************************************************/
-#ifndef _MAPIHD_H_
-#define _MAPIHD_H_
+#ifndef MAPIHD_H
+#define MAPIHD_H
#include <q3memarray.h>
--- trunk/KDE/kdepim/kaddressbook/xxport/pab_pablib.h #895802:895803
@@ -19,9 +19,10 @@
#ifndef KADDRESSBOOK_PAB_PABLIB_H
#define KADDRESSBOOK_PAB_PABLIB_H
-#include <klocale.h>
#include <QtCore/QFile>
+#include <klocale.h>
+
#include "pab_mapihd.h"
#define INDEX_OF_INDEX 0x000000c4
--- trunk/KDE/kdepim/kaddressbook/xxport/pab_xxport.cpp #895802:895803
@@ -22,6 +22,8 @@
without including the source code for Qt in the source distribution.
*/
+#include "pab_xxport.h"
+
#include <QtCore/QFile>
#include <kdebug.h>
@@ -35,8 +37,6 @@
#include "xxportmanager.h"
-#include "pab_xxport.h"
-
K_EXPORT_KADDRESSBOOK_XXFILTER( kaddrbk_pab_xxport, PABXXPort )
PABXXPort::PABXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name )
--- trunk/KDE/kdepim/kaddressbook/xxport/pab_xxport.h #895802:895803
@@ -27,6 +27,8 @@
#include <xxport.h>
+class QFile;
+
class PABXXPort : public KAB::XXPort
{
Q_OBJECT
--- trunk/KDE/kdepim/kaddressbook/xxport/vcard_xxport.cpp #895802:895803
@@ -21,6 +21,8 @@
without including the source code for Qt in the source distribution.
*/
+#include "vcard_xxport.h"
+
#include <QtCore/QFile>
#include <QtGui/QCheckBox>
#include <QtGui/QFont>
@@ -30,16 +32,16 @@
#include <QtGui/QVBoxLayout>
#include <kabc/vcardconverter.h>
+#include <kapplication.h>
#include <kdialog.h>
#include <kfiledialog.h>
#include <kio/netaccess.h>
#include <klocale.h>
#include <kmessagebox.h>
+#include <kpushbutton.h>
#include <ktemporaryfile.h>
#include <kurl.h>
-#include <kapplication.h>
#include <libkdepim/addresseeview.h>
-#include <kpushbutton.h>
#include "gpgme++/context.h"
#include "gpgme++/data.h"
@@ -47,7 +49,6 @@
#include "qgpgme/dataprovider.h"
#include "xxportmanager.h"
-#include "vcard_xxport.h"
K_EXPORT_KADDRESSBOOK_XXFILTER( kaddrbk_vcard_xxport, VCardXXPort )
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic