diff --git a/kmymoney/dialogs/CMakeLists.txt b/kmymoney/dialogs/CMakeLists.txt --- a/kmymoney/dialogs/CMakeLists.txt +++ b/kmymoney/dialogs/CMakeLists.txt @@ -22,7 +22,6 @@ kequitypriceupdatedlg.cpp kexportdlg.cpp kfindtransactiondlg.cpp - daterangedlg.cpp kgeneratesqldlg.cpp kgncimportoptionsdlg.cpp kgncpricesourcedlg.cpp @@ -65,7 +64,7 @@ keditscheduledlgdecl.ui kenterscheduledlgdecl.ui kequitypriceupdatedlgdecl.ui kexportdlgdecl.ui - kfindtransactiondlgdecl.ui daterangedlgdecl.ui kgeneratesqldlgdecl.ui kgncimportoptionsdlgdecl.ui + kfindtransactiondlgdecl.ui kgeneratesqldlgdecl.ui kgncimportoptionsdlgdecl.ui kgncpricesourcedlgdecl.ui kimportdlgdecl.ui kloadtemplatedlgdecl.ui kmymoneyfileinfodlgdecl.ui kmymoneypricedlgdecl.ui knewaccountdlgdecl.ui knewbankdlgdecl.ui knewbudgetdlgdecl.ui diff --git a/kmymoney/dialogs/kfindtransactiondlg.cpp b/kmymoney/dialogs/kfindtransactiondlg.cpp --- a/kmymoney/dialogs/kfindtransactiondlg.cpp +++ b/kmymoney/dialogs/kfindtransactiondlg.cpp @@ -63,7 +63,7 @@ #include "ui_kfindtransactiondlgdecl.h" #include "ui_ksortoptiondlg.h" -#include "ui_daterangedlgdecl.h" +#include enum ItemRoles { ItemIdRole = Qt::UserRole diff --git a/kmymoney/dialogs/kreportconfigurationfilterdlg.cpp b/kmymoney/dialogs/kreportconfigurationfilterdlg.cpp --- a/kmymoney/dialogs/kreportconfigurationfilterdlg.cpp +++ b/kmymoney/dialogs/kreportconfigurationfilterdlg.cpp @@ -61,7 +61,7 @@ #include #include "ui_kfindtransactiondlgdecl.h" -#include "ui_daterangedlgdecl.h" +#include #include #include #include diff --git a/kmymoney/widgets/CMakeLists.txt b/kmymoney/widgets/CMakeLists.txt --- a/kmymoney/widgets/CMakeLists.txt +++ b/kmymoney/widgets/CMakeLists.txt @@ -164,14 +164,15 @@ transactioneditorcontainer.cpp reporttabimpl.cpp reportcontrolimpl.cpp + daterangedlg.cpp ) set(libwidgets_a_UI kschedulebriefwidget.ui reportcontrol.ui reporttabgeneral.ui reporttabrowcolquery.ui reporttabrowcolpivot.ui reporttabrange.ui reporttabchart.ui - ../dialogs/daterangedlgdecl.ui + daterangedlgdecl.ui ) # using uic on the above UI files DEPENDS on libkmymoney.so. If uic diff --git a/kmymoney/dialogs/daterangedlg.h b/kmymoney/widgets/daterangedlg.h rename from kmymoney/dialogs/daterangedlg.h rename to kmymoney/widgets/daterangedlg.h --- a/kmymoney/dialogs/daterangedlg.h +++ b/kmymoney/widgets/daterangedlg.h @@ -1,5 +1,5 @@ /*************************************************************************** - kfindtransactiondlg.h + daterange.h ------------------- copyright : (C) 2003 by Thomas Baumgart email : ipwizard@users.sourceforge.net diff --git a/kmymoney/dialogs/daterangedlg.cpp b/kmymoney/widgets/daterangedlg.cpp rename from kmymoney/dialogs/daterangedlg.cpp rename to kmymoney/widgets/daterangedlg.cpp --- a/kmymoney/dialogs/daterangedlg.cpp +++ b/kmymoney/widgets/daterangedlg.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - kfindtransactiondlg.cpp + daterange.cpp ------------------- copyright : (C) 2003, 2007 by Thomas Baumgart email : ipwizard@users.sourceforge.net diff --git a/kmymoney/dialogs/daterangedlgdecl.ui b/kmymoney/widgets/daterangedlgdecl.ui rename from kmymoney/dialogs/daterangedlgdecl.ui rename to kmymoney/widgets/daterangedlgdecl.ui