| -rw-r--r-- | microkde/kutils/kcmultidialog.cpp | 16 | ||||
| -rw-r--r-- | microkde/kutils/kcmultidialog.h | 8 |
2 files changed, 13 insertions, 11 deletions
diff --git a/microkde/kutils/kcmultidialog.cpp b/microkde/kutils/kcmultidialog.cpp index 9c87682..88f17e5 100644 --- a/microkde/kutils/kcmultidialog.cpp +++ b/microkde/kutils/kcmultidialog.cpp @@ -16,16 +16,18 @@ along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <qhbox.h> -#include <qvbox.h> +#include <q3hbox.h> +#include <q3vbox.h> #include <qcursor.h> #include <qlayout.h> +//Added by qt3to4: +#include <QPixmap> #include <klocale.h> #include <kglobal.h> #include <kdebug.h> #include <kiconloader.h> #include <kmessagebox.h> @@ -70,13 +72,13 @@ KCMultiDialog::~KCMultiDialog() void KCMultiDialog::slotDefault() { int curPageIndex = activePageIndex(); - QPtrListIterator<KCModule> it(modules); + Q3PtrListIterator<KCModule> it(modules); for (; it.current(); ++it) { if (pageIndex((QWidget *)(*it)->parent()) == curPageIndex) { (*it)->defaults(); clientChanged(true); @@ -88,13 +90,13 @@ void KCMultiDialog::slotDefault() void KCMultiDialog::accept() { slotOk(); } void KCMultiDialog::slotApply() { - QPtrListIterator<KCModule> it(modules); + Q3PtrListIterator<KCModule> it(modules); for (; it.current(); ++it) (*it)->save(); clientChanged(false); emit applyClicked(); @@ -102,13 +104,13 @@ void KCMultiDialog::slotApply() void KCMultiDialog::slotOk() { qDebug("KCMultiDialog::slotOk clicked"); - QPtrListIterator<KCModule> it(modules); + Q3PtrListIterator<KCModule> it(modules); for (; it.current(); ++it) (*it)->save(); QDialog::accept(); emit okClicked(); } @@ -150,15 +152,15 @@ void KCMultiDialog::addModule(const QString& path, bool withfallback) } moduleDict.insert(page, new LoadInfo(path, withfallback)); if (modules.isEmpty()) slotAboutToShow(page); } */ -QVBox * KCMultiDialog::getNewVBoxPage( const QString & modulename ) +Q3VBox * KCMultiDialog::getNewVBoxPage( const QString & modulename ) { - QVBox *page = mMainWidget->addVBoxPage(modulename , QString::null,QPixmap() ); + Q3VBox *page = mMainWidget->addVBoxPage(modulename , QString::null,QPixmap() ); return page; } //US special method for microkde. We dop noty want to load everything dynamically. void KCMultiDialog::addModule(KCModule* module ) //, const QString& modulename, const QString& iconname) { diff --git a/microkde/kutils/kcmultidialog.h b/microkde/kutils/kcmultidialog.h index 66412ac..78f8a00 100644 --- a/microkde/kutils/kcmultidialog.h +++ b/microkde/kutils/kcmultidialog.h @@ -19,14 +19,14 @@ */ #ifndef KCMULTIDIALOG_H #define KCMULTIDIALOG_H -#include <qptrlist.h> -#include <qptrdict.h> +#include <q3ptrlist.h> +#include <q3ptrdict.h> #include <kdialogbase.h> #include <kjanuswidget.h> #include <kcmodule.h> /** @@ -72,13 +72,13 @@ public: **/ //US void addModule(const QString& module, bool withfallback=true); //US special method for microkde. We do not want to load everything dynamically. void addModule(KCModule* module );//, const QString& modulename, const QString& iconname); - QVBox* getNewVBoxPage(const QString & modulename) ; + Q3VBox* getNewVBoxPage(const QString & modulename) ; bool showPage( int index ); int activePageIndex() const; int pageIndex( QWidget *widget ) const; @@ -130,13 +130,13 @@ private: : path(_path), withfallback(_withfallback) { } QString path; bool withfallback; }; */ - QPtrList<KCModule> modules; + Q3PtrList<KCModule> modules; /* QPtrDict<LoadInfo> moduleDict; QString _docPath; */ QString _baseGroup; |