| -rw-r--r-- | core/pim/addressbook/abeditor.cpp | 2 | ||||
| -rw-r--r-- | core/pim/addressbook/addressbook.cpp | 8 | ||||
| -rw-r--r-- | core/pim/addressbook/addressbook.h | 4 | ||||
| -rw-r--r-- | core/pim/addressbook/addressbook.pro | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/core/pim/addressbook/abeditor.cpp b/core/pim/addressbook/abeditor.cpp index 94baa71..6354db9 100644 --- a/core/pim/addressbook/abeditor.cpp +++ b/core/pim/addressbook/abeditor.cpp @@ -52,9 +52,9 @@ void parseEmailTo( const QString &strDefaultEmail, AbEditor::AbEditor( const Contact &entry, const QValueList<int> *newOrdered, QStringList *slNewOrdered, - QWidget *parent, const char *name, WFlags fl ) + QWidget *parent = 0, const char *name = 0, WFlags fl = 0 ) : QDialog( parent, name, TRUE, fl ), orderedValues( newOrdered ), slOrdered( slNewOrdered ) { diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index a2b8276..e8fa37c 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp @@ -19,9 +19,9 @@ **********************************************************************/ #define QTOPIA_INTERNAL_FD -#include "abeditor.h" +#include "contacteditor.h" #include "ablabel.h" #include "abtable.h" #include "addresssettings.h" #include "addressbook.h" @@ -428,9 +428,9 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data) cnt.setDefaultEmail( email ); cnt.setFileAs(); if ( bAbEditFirstTime ) { - abEditor = new AbEditor( cnt, &orderedFields, &slOrderedFields, + abEditor = new ContactEditor( cnt, &orderedFields, &slOrderedFields, this, "editor" ); bAbEditFirstTime = FALSE; } else { abEditor->setEntry( cnt ); @@ -479,9 +479,9 @@ void AddressbookWindow::editPersonal() Contact me; if (QFile::exists(filename)) me = Contact::readVCard( filename )[0]; if (bAbEditFirstTime) { - abEditor = new AbEditor( me, &orderedFields, &slOrderedFields, + abEditor = new ContactEditor( me, &orderedFields, &slOrderedFields, this, "editor" ); // don't create a new editor every time bAbEditFirstTime = FALSE; } else @@ -539,9 +539,9 @@ void AddressbookWindow::slotPersonalView() void AddressbookWindow::editEntry( EntryMode entryMode ) { Contact entry; if ( bAbEditFirstTime ) { - abEditor = new AbEditor( entry, &orderedFields, &slOrderedFields, + abEditor = new ContactEditor( entry, &orderedFields, &slOrderedFields, this, "editor" ); bAbEditFirstTime = FALSE; if ( entryMode == EditEntry ) abEditor->setEntry( abList->currentEntry() ); diff --git a/core/pim/addressbook/addressbook.h b/core/pim/addressbook/addressbook.h index 9694465..342077f 100644 --- a/core/pim/addressbook/addressbook.h +++ b/core/pim/addressbook/addressbook.h @@ -21,9 +21,9 @@ #define Addressbook_H #include <qmainwindow.h> -class AbEditor; +class ContactEditor; class AbLabel; class AbTable; class QPEToolBar; class QPopupMenu; @@ -82,9 +82,9 @@ private: QValueList<int> allFields, orderedFields; QStringList slOrderedFields; enum Panes { paneList=0, paneView, paneEdit }; - AbEditor *abEditor; + ContactEditor *abEditor; AbLabel *mView; AbTable *abList; QAction *actionNew, *actionEdit, *actionTrash, *actionFind, *actionBeam, diff --git a/core/pim/addressbook/addressbook.pro b/core/pim/addressbook/addressbook.pro index 31de2a3..180b401 100644 --- a/core/pim/addressbook/addressbook.pro +++ b/core/pim/addressbook/addressbook.pro @@ -1,15 +1,15 @@ TEMPLATE = app CONFIG = qt warn_on release DESTDIR = $(OPIEDIR)/bin HEADERS = addressbook.h \ - abeditor.h \ + contacteditor.h \ ablabel.h \ abtable.h \ addresssettings.h SOURCES = main.cpp \ addressbook.cpp \ - abeditor.cpp \ + contacteditor.cpp \ ablabel.cpp \ abtable.cpp \ addresssettings.cpp INTERFACES = addresssettingsbase.ui |