diff options
Diffstat (limited to 'src/modules/dialog/libkvidialog.cpp')
| -rw-r--r-- | src/modules/dialog/libkvidialog.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp index 6b636528e..bd36697f6 100644 --- a/src/modules/dialog/libkvidialog.cpp +++ b/src/modules/dialog/libkvidialog.cpp @@ -59,7 +59,7 @@ KviKvsCallbackMessageBox::KviKvsCallbackMessageBox( const QString & szCode, KviKvsVariantList * pMagicParams, KviWindow * pWindow, bool modal) - : QMessageBox(0), + : QMessageBox(nullptr), KviKvsCallbackObject("dialog.message", pWindow, szCode, pMagicParams, 0) { setObjectName("dialog_message"); @@ -561,8 +561,8 @@ KviKvsCallbackFileDialog::KviKvsCallbackFileDialog( : KviFileDialog( szInitialSelection, szFilter, - NULL, // parent - 0, + nullptr, // parent + nullptr, modal), KviKvsCallbackObject("dialog.file", pWindow, szCode, pMagicParams, 0) { @@ -592,9 +592,9 @@ void KviKvsCallbackFileDialog::done(int code) KviKvsArray * a = new KviKvsArray(); QStringList sl = selectedFiles(); int idx = 0; - for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it) + for(auto & it : sl) { - a->set(idx, new KviKvsVariant(*it)); + a->set(idx, new KviKvsVariant(it)); idx++; } params.append(new KviKvsVariant(a)); @@ -704,7 +704,7 @@ KviKvsCallbackImageDialog::KviKvsCallbackImageDialog( const QString & szCode, KviKvsVariantList * pMagicParams, KviWindow * pWindow, bool modal) - : KviImageDialog(0, szCaption, iType, 0, szInitialSelection, iMaxSize, modal), KviKvsCallbackObject("dialog.image", pWindow, szCode, pMagicParams, 0) + : KviImageDialog(nullptr, szCaption, iType, 0, szInitialSelection, iMaxSize, modal), KviKvsCallbackObject("dialog.image", pWindow, szCode, pMagicParams, 0) { g_pDialogModuleDialogList->append(this); setObjectName("dialog_image"); @@ -956,7 +956,7 @@ static bool dialog_module_cleanup(KviModule *) while(g_pDialogModuleDialogList->first()) delete g_pDialogModuleDialogList->first(); delete g_pDialogModuleDialogList; - g_pDialogModuleDialogList = 0; + g_pDialogModuleDialogList = nullptr; return true; } |