Git commit 8e689c981bad6e5ec996f12f6a6a1cd4368f5c69 by Kevin Ottens. Committed on 04/04/2014 at 09:35. Pushed by ervin into branch 'master'. Move all the old code in an attic folder Should help newcomers to find their way in the newer code base. And it's clear where to look for already solved problems. M +1 -0 CMakeLists.txt A +2 -0 attic/CMakeLists.txt C +4 -4 attic/src/CMakeLists.txt [from: src/CMakeLists.txt - 096% si= milarity] R +0 -0 attic/src/app/CMakeLists.txt [from: src/app/CMakeLists.txt -= 100% similarity] R +0 -0 attic/src/app/aboutdata.cpp [from: src/app/aboutdata.cpp - 1= 00% similarity] R +0 -0 attic/src/app/aboutdata.h [from: src/app/aboutdata.h - 100% = similarity] R +0 -0 attic/src/app/collectionconfig.cpp [from: src/app/collection= config.cpp - 100% similarity] R +0 -0 attic/src/app/collectionconfig.h [from: src/app/collectionco= nfig.h - 100% similarity] R +0 -0 attic/src/app/configdialog.cpp [from: src/app/configdialog.c= pp - 100% similarity] R +0 -0 attic/src/app/configdialog.h [from: src/app/configdialog.h -= 100% similarity] R +0 -0 attic/src/app/debugwindow.cpp [from: src/app/debugwindow.cpp= - 100% similarity] R +0 -0 attic/src/app/debugwindow.h [from: src/app/debugwindow.h - 1= 00% similarity] R +0 -0 attic/src/app/kontact_plugin.cpp [from: src/app/kontact_plug= in.cpp - 100% similarity] R +0 -0 attic/src/app/kontact_plugin.h [from: src/app/kontact_plugin= .h - 100% similarity] R +0 -0 attic/src/app/main.cpp [from: src/app/main.cpp - 100% simila= rity] R +0 -0 attic/src/app/maincomponent.cpp [from: src/app/maincomponent= .cpp - 100% similarity] R +0 -0 attic/src/app/maincomponent.h [from: src/app/maincomponent.h= - 100% similarity] R +0 -0 attic/src/app/mainwindow.cpp [from: src/app/mainwindow.cpp -= 100% similarity] R +0 -0 attic/src/app/mainwindow.h [from: src/app/mainwindow.h - 100= % similarity] R +0 -0 attic/src/app/part.cpp [from: src/app/part.cpp - 100% simila= rity] R +0 -0 attic/src/app/part.h [from: src/app/part.h - 100% similarity] R +0 -0 attic/src/app/resourceconfig.cpp [from: src/app/resourceconf= ig.cpp - 100% similarity] R +0 -0 attic/src/app/resourceconfig.h [from: src/app/resourceconfig= .h - 100% similarity] R +0 -0 attic/src/app/zanshin.desktop [from: src/app/zanshin.desktop= - 100% similarity] R +0 -0 attic/src/app/zanshin_part.desktop [from: src/app/zanshin_pa= rt.desktop - 100% similarity] R +0 -0 attic/src/app/zanshin_part.rc [from: src/app/zanshin_part.rc= - 100% similarity] R +0 -0 attic/src/app/zanshin_plugin.desktop [from: src/app/zanshin_= plugin.desktop - 100% similarity] R +0 -0 attic/src/app/zanshinui.rc [from: src/app/zanshinui.rc - 100= % similarity] R +0 -0 attic/src/core/CMakeLists.txt [from: src/core/CMakeLists.txt= - 100% similarity] R +0 -0 attic/src/core/akonadibaseitem.cpp [from: src/core/akonadiba= seitem.cpp - 100% similarity] R +0 -0 attic/src/core/akonadibaseitem.h [from: src/core/akonadibase= item.h - 100% similarity] R +0 -0 attic/src/core/akonadicollectionitem.cpp [from: src/core/ako= nadicollectionitem.cpp - 100% similarity] R +0 -0 attic/src/core/akonadicollectionitem.h [from: src/core/akona= dicollectionitem.h - 100% similarity] R +0 -0 attic/src/core/akonadidatastore.cpp [from: src/core/akonadid= atastore.cpp - 100% similarity] R +0 -0 attic/src/core/akonadidatastore.h [from: src/core/akonadidat= astore.h - 100% similarity] R +0 -0 attic/src/core/akonadiincidenceitem.cpp [from: src/core/akon= adiincidenceitem.cpp - 100% similarity] R +0 -0 attic/src/core/akonadiincidenceitem.h [from: src/core/akonad= iincidenceitem.h - 100% similarity] R +0 -0 attic/src/core/akonadinoteitem.cpp [from: src/core/akonadino= teitem.cpp - 100% similarity] R +0 -0 attic/src/core/akonadinoteitem.h [from: src/core/akonadinote= item.h - 100% similarity] R +0 -0 attic/src/core/datastoreinterface.cpp [from: src/core/datast= oreinterface.cpp - 100% similarity] R +0 -0 attic/src/core/datastoreinterface.h [from: src/core/datastor= einterface.h - 100% similarity] R +0 -0 attic/src/core/modelstack.cpp [from: src/core/modelstack.cpp= - 100% similarity] R +0 -0 attic/src/core/modelstack.h [from: src/core/modelstack.h - 1= 00% similarity] R +0 -0 attic/src/core/pimitem.cpp [from: src/core/pimitem.cpp - 100= % similarity] R +0 -0 attic/src/core/pimitem.h [from: src/core/pimitem.h - 100% si= milarity] R +0 -0 attic/src/core/pimitemfactory.cpp [from: src/core/pimitemfac= tory.cpp - 100% similarity] R +0 -0 attic/src/core/pimitemfactory.h [from: src/core/pimitemfacto= ry.h - 100% similarity] R +0 -0 attic/src/core/pimitemmodel.cpp [from: src/core/pimitemmodel= .cpp - 100% similarity] R +0 -0 attic/src/core/pimitemmodel.h [from: src/core/pimitemmodel.h= - 100% similarity] R +0 -0 attic/src/core/pimitemmonitor.cpp [from: src/core/pimitemmon= itor.cpp - 100% similarity] R +0 -0 attic/src/core/pimitemmonitor.h [from: src/core/pimitemmonit= or.h - 100% similarity] R +0 -0 attic/src/core/pimitemrelationcache.cpp [from: src/core/pimi= temrelationcache.cpp - 100% similarity] R +0 -0 attic/src/core/pimitemrelationcache.h [from: src/core/pimite= mrelationcache.h - 100% similarity] R +0 -0 attic/src/core/pimitemrelations.cpp [from: src/core/pimitemr= elations.cpp - 100% similarity] R +0 -0 attic/src/core/pimitemrelations.h [from: src/core/pimitemrel= ations.h - 100% similarity] R +0 -0 attic/src/core/pimitemservices.cpp [from: src/core/pimitemse= rvices.cpp - 100% similarity] R +0 -0 attic/src/core/pimitemservices.h [from: src/core/pimitemserv= ices.h - 100% similarity] R +0 -0 attic/src/core/pimitemstructurecache.cpp [from: src/core/pim= itemstructurecache.cpp - 100% similarity] R +0 -0 attic/src/core/pimitemstructurecache.h [from: src/core/pimit= emstructurecache.h - 100% similarity] R +0 -0 attic/src/core/projectstrategy.cpp [from: src/core/projectst= rategy.cpp - 100% similarity] R +0 -0 attic/src/core/projectstrategy.h [from: src/core/projectstra= tegy.h - 100% similarity] R +0 -0 attic/src/core/structurecachestrategy.cpp [from: src/core/st= ructurecachestrategy.cpp - 100% similarity] R +0 -0 attic/src/core/structurecachestrategy.h [from: src/core/stru= cturecachestrategy.h - 100% similarity] R +0 -0 attic/src/core/todometadatamodel.cpp [from: src/core/todomet= adatamodel.cpp - 100% similarity] R +0 -0 attic/src/core/todometadatamodel.h [from: src/core/todometad= atamodel.h - 100% similarity] R +0 -0 attic/src/core/virtualitem.cpp [from: src/core/virtualitem.c= pp - 100% similarity] R +0 -0 attic/src/core/virtualitem.h [from: src/core/virtualitem.h -= 100% similarity] R +0 -0 attic/src/globaldefs.h [from: src/globaldefs.h - 100% simila= rity] R +0 -0 attic/src/gui/CMakeLists.txt [from: src/gui/CMakeLists.txt -= 100% similarity] R +0 -0 attic/src/gui/itemeditor/CMakeLists.txt [from: src/gui/iteme= ditor/CMakeLists.txt - 100% similarity] R +0 -0 attic/src/gui/itemeditor/attachmentsviewer.cpp [from: src/gu= i/itemeditor/attachmentsviewer.cpp - 100% similarity] R +0 -0 attic/src/gui/itemeditor/attachmentsviewer.h [from: src/gui/= itemeditor/attachmentsviewer.h - 100% similarity] R +0 -0 attic/src/gui/itemeditor/combomodel.cpp [from: src/gui/iteme= ditor/combomodel.cpp - 100% similarity] R +0 -0 attic/src/gui/itemeditor/combomodel.h [from: src/gui/itemedi= tor/combomodel.h - 100% similarity] R +0 -0 attic/src/gui/itemeditor/editablewidget.cpp [from: src/gui/i= temeditor/editablewidget.cpp - 100% similarity] R +0 -0 attic/src/gui/itemeditor/editablewidget.h [from: src/gui/ite= meditor/editablewidget.h - 100% similarity] R +0 -0 attic/src/gui/itemeditor/editorui.rc [from: src/gui/itemedit= or/editorui.rc - 100% similarity] R +0 -0 attic/src/gui/itemeditor/editorwidget.cpp [from: src/gui/ite= meditor/editorwidget.cpp - 100% similarity] R +0 -0 attic/src/gui/itemeditor/editorwidget.h [from: src/gui/iteme= ditor/editorwidget.h - 100% similarity] R +0 -0 attic/src/gui/itemeditor/guiclient.cpp [from: src/gui/itemed= itor/guiclient.cpp - 100% similarity] R +0 -0 attic/src/gui/itemeditor/guiclient.h [from: src/gui/itemedit= or/guiclient.h - 100% similarity] R +0 -0 attic/src/gui/itemeditor/itemeditor.cpp [from: src/gui/iteme= ditor/itemeditor.cpp - 100% similarity] R +0 -0 attic/src/gui/itemeditor/itemeditor.h [from: src/gui/itemedi= tor/itemeditor.h - 100% similarity] R +0 -0 attic/src/gui/itemeditor/itemview.ui [from: src/gui/itemedit= or/itemview.ui - 100% similarity] R +0 -0 attic/src/gui/itemeditor/properties.ui [from: src/gui/itemed= itor/properties.ui - 100% similarity] R +0 -0 attic/src/gui/itemeditor/toolbox.cpp [from: src/gui/itemedit= or/toolbox.cpp - 100% similarity] R +0 -0 attic/src/gui/itemeditor/toolbox.h [from: src/gui/itemeditor= /toolbox.h - 100% similarity] R +0 -0 attic/src/gui/itemlist/CMakeLists.txt [from: src/gui/itemlis= t/CMakeLists.txt - 100% similarity] R +0 -0 attic/src/gui/itemlist/actionduedatedelegate.cpp [from: src/= gui/itemlist/actionduedatedelegate.cpp - 100% similarity] R +0 -0 attic/src/gui/itemlist/actionduedatedelegate.h [from: src/gu= i/itemlist/actionduedatedelegate.h - 100% similarity] R +0 -0 attic/src/gui/itemlist/actionlistcombobox.cpp [from: src/gui= /itemlist/actionlistcombobox.cpp - 100% similarity] R +0 -0 attic/src/gui/itemlist/actionlistcombobox.h [from: src/gui/i= temlist/actionlistcombobox.h - 100% similarity] R +0 -0 attic/src/gui/itemlist/actionlistdelegate.cpp [from: src/gui= /itemlist/actionlistdelegate.cpp - 100% similarity] R +0 -0 attic/src/gui/itemlist/actionlistdelegate.h [from: src/gui/i= temlist/actionlistdelegate.h - 100% similarity] R +0 -0 attic/src/gui/itemlist/actionlisteditor.cpp [from: src/gui/i= temlist/actionlisteditor.cpp - 100% similarity] R +0 -0 attic/src/gui/itemlist/actionlisteditor.h [from: src/gui/ite= mlist/actionlisteditor.h - 100% similarity] R +0 -0 attic/src/gui/itemlist/actionlisteditorpage.cpp [from: src/g= ui/itemlist/actionlisteditorpage.cpp - 100% similarity] R +0 -0 attic/src/gui/itemlist/actionlisteditorpage.h [from: src/gui= /itemlist/actionlisteditorpage.h - 100% similarity] R +0 -0 attic/src/gui/itemlist/filterproxymodel.cpp [from: src/gui/i= temlist/filterproxymodel.cpp - 100% similarity] R +0 -0 attic/src/gui/itemlist/filterproxymodel.h [from: src/gui/ite= mlist/filterproxymodel.h - 100% similarity] R +0 -0 attic/src/gui/itemlist/itemselectorproxy.cpp [from: src/gui/= itemlist/itemselectorproxy.cpp - 100% similarity] R +0 -0 attic/src/gui/itemlist/itemselectorproxy.h [from: src/gui/it= emlist/itemselectorproxy.h - 100% similarity] R +0 -0 attic/src/gui/itemlist/quickselectdialog.cpp [from: src/gui/= itemlist/quickselectdialog.cpp - 100% similarity] R +0 -0 attic/src/gui/itemlist/quickselectdialog.h [from: src/gui/it= emlist/quickselectdialog.h - 100% similarity] R +0 -0 attic/src/gui/itemlist/searchbar.cpp [from: src/gui/itemlist= /searchbar.cpp - 100% similarity] R +0 -0 attic/src/gui/itemlist/searchbar.h [from: src/gui/itemlist/s= earchbar.h - 100% similarity] R +0 -0 attic/src/gui/shared/CMakeLists.txt [from: src/gui/shared/CM= akeLists.txt - 100% similarity] R +0 -0 attic/src/gui/shared/selectionproxymodel.cpp [from: src/gui/= shared/selectionproxymodel.cpp - 100% similarity] R +0 -0 attic/src/gui/shared/selectionproxymodel.h [from: src/gui/sh= ared/selectionproxymodel.h - 100% similarity] R +0 -0 attic/src/gui/shared/todotreeview.cpp [from: src/gui/shared/= todotreeview.cpp - 100% similarity] R +0 -0 attic/src/gui/shared/todotreeview.h [from: src/gui/shared/to= dotreeview.h - 100% similarity] R +0 -0 attic/src/gui/sidebar/CMakeLists.txt [from: src/gui/sidebar/= CMakeLists.txt - 100% similarity] R +0 -0 attic/src/gui/sidebar/sidebar.cpp [from: src/gui/sidebar/sid= ebar.cpp - 100% similarity] R +0 -0 attic/src/gui/sidebar/sidebar.h [from: src/gui/sidebar/sideb= ar.h - 100% similarity] R +0 -0 attic/src/gui/sidebar/sidebarmodel.cpp [from: src/gui/sideba= r/sidebarmodel.cpp - 100% similarity] R +0 -0 attic/src/gui/sidebar/sidebarmodel.h [from: src/gui/sidebar/= sidebarmodel.h - 100% similarity] R +0 -0 attic/src/gui/sidebar/sidebarpage.cpp [from: src/gui/sidebar= /sidebarpage.cpp - 100% similarity] R +0 -0 attic/src/gui/sidebar/sidebarpage.h [from: src/gui/sidebar/s= idebarpage.h - 100% similarity] R +0 -0 attic/src/icons/CMakeLists.txt [from: src/icons/CMakeLists.t= xt - 100% similarity] R +- -- attic/src/icons/hi128-apps-zanshin.png [from: src/icons/hi12= 8-apps-zanshin.png - 100% similarity] R +- -- attic/src/icons/hi256-apps-zanshin.png [from: src/icons/hi25= 6-apps-zanshin.png - 100% similarity] R +- -- attic/src/icons/hi32-apps-zanshin.png [from: src/icons/hi32-= apps-zanshin.png - 100% similarity] R +- -- attic/src/icons/hi64-apps-zanshin.png [from: src/icons/hi64-= apps-zanshin.png - 100% similarity] R +- -- attic/src/icons/hisc-apps-zanshin.svgz [from: src/icons/hisc= -apps-zanshin.svgz - 100% similarity] R +0 -0 attic/src/reparentingmodel/CMakeLists.txt [from: src/reparen= tingmodel/CMakeLists.txt - 100% similarity] R +0 -0 attic/src/reparentingmodel/kbihash_p.h [from: src/reparentin= gmodel/kbihash_p.h - 100% similarity] R +0 -0 attic/src/reparentingmodel/reparentingmodel.cpp [from: src/r= eparentingmodel/reparentingmodel.cpp - 100% similarity] R +0 -0 attic/src/reparentingmodel/reparentingmodel.h [from: src/rep= arentingmodel/reparentingmodel.h - 100% similarity] R +0 -0 attic/src/reparentingmodel/reparentingstrategy.cpp [from: sr= c/reparentingmodel/reparentingstrategy.cpp - 100% similarity] R +0 -0 attic/src/reparentingmodel/reparentingstrategy.h [from: src/= reparentingmodel/reparentingstrategy.h - 100% similarity] R +0 -0 attic/src/reparentingmodel/todonode.cpp [from: src/reparenti= ngmodel/todonode.cpp - 100% similarity] R +0 -0 attic/src/reparentingmodel/todonode.h [from: src/reparenting= model/todonode.h - 100% similarity] R +0 -0 attic/src/reparentingmodel/todonodemanager.cpp [from: src/re= parentingmodel/todonodemanager.cpp - 100% similarity] R +0 -0 attic/src/reparentingmodel/todonodemanager.h [from: src/repa= rentingmodel/todonodemanager.h - 100% similarity] R +0 -0 attic/src/reparentingmodel/todoproxymodelbase.cpp [from: src= /reparentingmodel/todoproxymodelbase.cpp - 100% similarity] R +0 -0 attic/src/reparentingmodel/todoproxymodelbase.h [from: src/r= eparentingmodel/todoproxymodelbase.h - 100% similarity] R +0 -0 attic/src/runner/CMakeLists.txt [from: src/runner/CMakeLists= .txt - 100% similarity] R +0 -0 attic/src/runner/plasma-runner-zanshin.desktop [from: src/ru= nner/plasma-runner-zanshin.desktop - 100% similarity] R +0 -0 attic/src/runner/zanshinrunner.cpp [from: src/runner/zanshin= runner.cpp - 100% similarity] R +0 -0 attic/src/runner/zanshinrunner.h [from: src/runner/zanshinru= nner.h - 100% similarity] R +0 -0 attic/src/todohelpers.cpp [from: src/todohelpers.cpp - 100% = similarity] R +0 -0 attic/src/todohelpers.h [from: src/todohelpers.h - 100% simi= larity] C +3 -5 attic/src/utils/CMakeLists.txt [from: src/utils/CMakeLists.t= xt - 057% similarity] R +0 -0 attic/src/utils/datestringbuilder.cpp [from: src/utils/dates= tringbuilder.cpp - 100% similarity] R +0 -0 attic/src/utils/datestringbuilder.h [from: src/utils/datestr= ingbuilder.h - 100% similarity] R +0 -0 attic/src/utils/kdateedit.cpp [from: src/utils/kdateedit.cpp= - 100% similarity] R +0 -0 attic/src/utils/kdateedit.h [from: src/utils/kdateedit.h - 1= 00% similarity] R +0 -0 attic/src/utils/kdatepickerpopup.cpp [from: src/utils/kdatep= ickerpopup.cpp - 100% similarity] R +0 -0 attic/src/utils/kdatepickerpopup.h [from: src/utils/kdatepic= kerpopup.h - 100% similarity] C +1 -3 attic/tests/CMakeLists.txt [from: tests/CMakeLists.txt - 096= % similarity] R +0 -0 attic/tests/modelstacktest.cpp [from: tests/modelstacktest.c= pp - 100% similarity] R +0 -0 attic/tests/parentstructuremodelspec.cpp [from: tests/parent= structuremodelspec.cpp - 100% similarity] R +0 -0 attic/tests/pimitemrelationstest.cpp [from: tests/pimitemrel= ationstest.cpp - 100% similarity] R +0 -0 attic/tests/pimitemtest.cpp [from: tests/pimitemtest.cpp - 1= 00% similarity] R +0 -0 attic/tests/reparentingmodelspec.cpp [from: tests/reparentin= gmodelspec.cpp - 100% similarity] R +0 -0 attic/tests/selectionproxymodeltest.cpp [from: tests/selecti= onproxymodeltest.cpp - 100% similarity] R +0 -0 attic/tests/sidebarmodelspec.cpp [from: tests/sidebarmodelsp= ec.cpp - 100% similarity] C +1 -1 attic/tests/testlib/CMakeLists.txt [from: tests/testlib/CMak= eLists.txt - 088% similarity] R +0 -0 attic/tests/testlib/c.cpp [from: tests/testlib/c.cpp - 100% = similarity] R +0 -0 attic/tests/testlib/c.h [from: tests/testlib/c.h - 100% simi= larity] R +0 -0 attic/tests/testlib/cat.cpp [from: tests/testlib/cat.cpp - 1= 00% similarity] R +0 -0 attic/tests/testlib/cat.h [from: tests/testlib/cat.h - 100% = similarity] R +0 -0 attic/tests/testlib/dsl.h [from: tests/testlib/dsl.h - 100% = similarity] R +0 -0 attic/tests/testlib/g.cpp [from: tests/testlib/g.cpp - 100% = similarity] R +0 -0 attic/tests/testlib/g.h [from: tests/testlib/g.h - 100% simi= larity] R +0 -0 attic/tests/testlib/helperutils.h [from: tests/testlib/helpe= rutils.h - 100% similarity] R +0 -0 attic/tests/testlib/indent.cpp [from: tests/testlib/indent.c= pp - 100% similarity] R +0 -0 attic/tests/testlib/indent.h [from: tests/testlib/indent.h -= 100% similarity] R +0 -0 attic/tests/testlib/mockdatastore.cpp [from: tests/testlib/m= ockdatastore.cpp - 100% similarity] R +0 -0 attic/tests/testlib/mockdatastore.h [from: tests/testlib/moc= kdatastore.h - 100% similarity] R +0 -0 attic/tests/testlib/mockmodel.cpp [from: tests/testlib/mockm= odel.cpp - 100% similarity] R +0 -0 attic/tests/testlib/mockmodel.h [from: tests/testlib/mockmod= el.h - 100% similarity] R +0 -0 attic/tests/testlib/mockpimitem.cpp [from: tests/testlib/moc= kpimitem.cpp - 100% similarity] R +0 -0 attic/tests/testlib/mockpimitem.h [from: tests/testlib/mockp= imitem.h - 100% similarity] R +0 -0 attic/tests/testlib/modelbuilderbehavior.cpp [from: tests/te= stlib/modelbuilderbehavior.cpp - 100% similarity] R +0 -0 attic/tests/testlib/modelbuilderbehavior.h [from: tests/test= lib/modelbuilderbehavior.h - 100% similarity] R +0 -0 attic/tests/testlib/modelnode.cpp [from: tests/testlib/model= node.cpp - 100% similarity] R +0 -0 attic/tests/testlib/modelnode.h [from: tests/testlib/modelno= de.h - 100% similarity] R +0 -0 attic/tests/testlib/modelpath.cpp [from: tests/testlib/model= path.cpp - 100% similarity] R +0 -0 attic/tests/testlib/modelpath.h [from: tests/testlib/modelpa= th.h - 100% similarity] R +0 -0 attic/tests/testlib/modelstructure.cpp [from: tests/testlib/= modelstructure.cpp - 100% similarity] R +0 -0 attic/tests/testlib/modelstructure.h [from: tests/testlib/mo= delstructure.h - 100% similarity] R +0 -0 attic/tests/testlib/modeltest.cpp [from: tests/testlib/model= test.cpp - 100% similarity] R +0 -0 attic/tests/testlib/modeltest.h [from: tests/testlib/modelte= st.h - 100% similarity] R +0 -0 attic/tests/testlib/modelutils.cpp [from: tests/testlib/mode= lutils.cpp - 100% similarity] R +0 -0 attic/tests/testlib/modelutils.h [from: tests/testlib/modelu= tils.h - 100% similarity] R +0 -0 attic/tests/testlib/qcompare.cpp [from: tests/testlib/qcompa= re.cpp - 100% similarity] R +0 -0 attic/tests/testlib/qcompare.h [from: tests/testlib/qcompare= .h - 100% similarity] R +0 -0 attic/tests/testlib/t.cpp [from: tests/testlib/t.cpp - 100% = similarity] R +0 -0 attic/tests/testlib/t.h [from: tests/testlib/t.h - 100% simi= larity] R +0 -0 attic/tests/testlib/testlib.h [from: tests/testlib/testlib.h= - 100% similarity] R +0 -0 attic/tests/testlib/tests/CMakeLists.txt [from: tests/testli= b/tests/CMakeLists.txt - 100% similarity] R +0 -0 attic/tests/testlib/tests/modelstructuretest.cpp [from: test= s/testlib/tests/modelstructuretest.cpp - 100% similarity] R +0 -0 attic/tests/testlib/v.cpp [from: tests/testlib/v.cpp - 100% = similarity] R +0 -0 attic/tests/testlib/v.h [from: tests/testlib/v.h - 100% simi= larity] R +0 -0 attic/tests/todocontextsmodelspec.cpp [from: tests/todoconte= xtsmodelspec.cpp - 100% similarity] R +0 -0 attic/tests/todometadatamodelspec.cpp [from: tests/todometad= atamodelspec.cpp - 100% similarity] R +0 -0 attic/tests/todotreemodelspec.cpp [from: tests/todotreemodel= spec.cpp - 100% similarity] M +0 -88 src/CMakeLists.txt M +5 -1 src/akonadi/CMakeLists.txt M +0 -7 src/utils/CMakeLists.txt M +15 -33 tests/CMakeLists.txt M +3 -24 tests/testlib/CMakeLists.txt M +1 -2 tests/units/akonadi/CMakeLists.txt http://commits.kde.org/zanshin/8e689c981bad6e5ec996f12f6a6a1cd4368f5c69 diff --git a/CMakeLists.txt b/CMakeLists.txt index 11b6b68..4e3f526 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,7 @@ include_directories ( ${Boost_INCLUDE_DIR} ) = +add_subdirectory(attic) add_subdirectory(src) add_subdirectory(tests) = diff --git a/attic/CMakeLists.txt b/attic/CMakeLists.txt new file mode 100644 index 0000000..fdfb8f4 --- /dev/null +++ b/attic/CMakeLists.txt @@ -0,0 +1,2 @@ +add_subdirectory(src) +add_subdirectory(tests) diff --git a/src/CMakeLists.txt b/attic/src/CMakeLists.txt similarity index 96% copy from src/CMakeLists.txt copy to attic/src/CMakeLists.txt index 44329fc..222b5dc 100644 --- a/src/CMakeLists.txt +++ b/attic/src/CMakeLists.txt @@ -1,12 +1,10 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_SOURCE_DIR}/src) = -add_subdirectory(akonadi) add_subdirectory(app) add_subdirectory(core) -add_subdirectory(domain) add_subdirectory(gui) add_subdirectory(icons) -add_subdirectory(presentation) add_subdirectory(reparentingmodel) add_subdirectory(runner) add_subdirectory(utils) @@ -24,9 +22,11 @@ set(zanshin_core_LIBS ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_KCALCORE_LIBS} ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS} + ${KDE4_KIO_LIBS} + ${QT_QTXML_LIBRARY} akonadi domain - kio + oldutils utils ) = diff --git a/src/app/CMakeLists.txt b/attic/src/app/CMakeLists.txt similarity index 100% rename from src/app/CMakeLists.txt rename to attic/src/app/CMakeLists.txt diff --git a/src/app/aboutdata.cpp b/attic/src/app/aboutdata.cpp similarity index 100% rename from src/app/aboutdata.cpp rename to attic/src/app/aboutdata.cpp diff --git a/src/app/aboutdata.h b/attic/src/app/aboutdata.h similarity index 100% rename from src/app/aboutdata.h rename to attic/src/app/aboutdata.h diff --git a/src/app/collectionconfig.cpp b/attic/src/app/collectionconfig.= cpp similarity index 100% rename from src/app/collectionconfig.cpp rename to attic/src/app/collectionconfig.cpp diff --git a/src/app/collectionconfig.h b/attic/src/app/collectionconfig.h similarity index 100% rename from src/app/collectionconfig.h rename to attic/src/app/collectionconfig.h diff --git a/src/app/configdialog.cpp b/attic/src/app/configdialog.cpp similarity index 100% rename from src/app/configdialog.cpp rename to attic/src/app/configdialog.cpp diff --git a/src/app/configdialog.h b/attic/src/app/configdialog.h similarity index 100% rename from src/app/configdialog.h rename to attic/src/app/configdialog.h diff --git a/src/app/debugwindow.cpp b/attic/src/app/debugwindow.cpp similarity index 100% rename from src/app/debugwindow.cpp rename to attic/src/app/debugwindow.cpp diff --git a/src/app/debugwindow.h b/attic/src/app/debugwindow.h similarity index 100% rename from src/app/debugwindow.h rename to attic/src/app/debugwindow.h diff --git a/src/app/kontact_plugin.cpp b/attic/src/app/kontact_plugin.cpp similarity index 100% rename from src/app/kontact_plugin.cpp rename to attic/src/app/kontact_plugin.cpp diff --git a/src/app/kontact_plugin.h b/attic/src/app/kontact_plugin.h similarity index 100% rename from src/app/kontact_plugin.h rename to attic/src/app/kontact_plugin.h diff --git a/src/app/main.cpp b/attic/src/app/main.cpp similarity index 100% rename from src/app/main.cpp rename to attic/src/app/main.cpp diff --git a/src/app/maincomponent.cpp b/attic/src/app/maincomponent.cpp similarity index 100% rename from src/app/maincomponent.cpp rename to attic/src/app/maincomponent.cpp diff --git a/src/app/maincomponent.h b/attic/src/app/maincomponent.h similarity index 100% rename from src/app/maincomponent.h rename to attic/src/app/maincomponent.h diff --git a/src/app/mainwindow.cpp b/attic/src/app/mainwindow.cpp similarity index 100% rename from src/app/mainwindow.cpp rename to attic/src/app/mainwindow.cpp diff --git a/src/app/mainwindow.h b/attic/src/app/mainwindow.h similarity index 100% rename from src/app/mainwindow.h rename to attic/src/app/mainwindow.h diff --git a/src/app/part.cpp b/attic/src/app/part.cpp similarity index 100% rename from src/app/part.cpp rename to attic/src/app/part.cpp diff --git a/src/app/part.h b/attic/src/app/part.h similarity index 100% rename from src/app/part.h rename to attic/src/app/part.h diff --git a/src/app/resourceconfig.cpp b/attic/src/app/resourceconfig.cpp similarity index 100% rename from src/app/resourceconfig.cpp rename to attic/src/app/resourceconfig.cpp diff --git a/src/app/resourceconfig.h b/attic/src/app/resourceconfig.h similarity index 100% rename from src/app/resourceconfig.h rename to attic/src/app/resourceconfig.h diff --git a/src/app/zanshin.desktop b/attic/src/app/zanshin.desktop similarity index 100% rename from src/app/zanshin.desktop rename to attic/src/app/zanshin.desktop diff --git a/src/app/zanshin_part.desktop b/attic/src/app/zanshin_part.desk= top similarity index 100% rename from src/app/zanshin_part.desktop rename to attic/src/app/zanshin_part.desktop diff --git a/src/app/zanshin_part.rc b/attic/src/app/zanshin_part.rc similarity index 100% rename from src/app/zanshin_part.rc rename to attic/src/app/zanshin_part.rc diff --git a/src/app/zanshin_plugin.desktop b/attic/src/app/zanshin_plugin.= desktop similarity index 100% rename from src/app/zanshin_plugin.desktop rename to attic/src/app/zanshin_plugin.desktop diff --git a/src/app/zanshinui.rc b/attic/src/app/zanshinui.rc similarity index 100% rename from src/app/zanshinui.rc rename to attic/src/app/zanshinui.rc diff --git a/src/core/CMakeLists.txt b/attic/src/core/CMakeLists.txt similarity index 100% rename from src/core/CMakeLists.txt rename to attic/src/core/CMakeLists.txt diff --git a/src/core/akonadibaseitem.cpp b/attic/src/core/akonadibaseitem.= cpp similarity index 100% rename from src/core/akonadibaseitem.cpp rename to attic/src/core/akonadibaseitem.cpp diff --git a/src/core/akonadibaseitem.h b/attic/src/core/akonadibaseitem.h similarity index 100% rename from src/core/akonadibaseitem.h rename to attic/src/core/akonadibaseitem.h diff --git a/src/core/akonadicollectionitem.cpp b/attic/src/core/akonadicol= lectionitem.cpp similarity index 100% rename from src/core/akonadicollectionitem.cpp rename to attic/src/core/akonadicollectionitem.cpp diff --git a/src/core/akonadicollectionitem.h b/attic/src/core/akonadicolle= ctionitem.h similarity index 100% rename from src/core/akonadicollectionitem.h rename to attic/src/core/akonadicollectionitem.h diff --git a/src/core/akonadidatastore.cpp b/attic/src/core/akonadidatastor= e.cpp similarity index 100% rename from src/core/akonadidatastore.cpp rename to attic/src/core/akonadidatastore.cpp diff --git a/src/core/akonadidatastore.h b/attic/src/core/akonadidatastore.h similarity index 100% rename from src/core/akonadidatastore.h rename to attic/src/core/akonadidatastore.h diff --git a/src/core/akonadiincidenceitem.cpp b/attic/src/core/akonadiinci= denceitem.cpp similarity index 100% rename from src/core/akonadiincidenceitem.cpp rename to attic/src/core/akonadiincidenceitem.cpp diff --git a/src/core/akonadiincidenceitem.h b/attic/src/core/akonadiincide= nceitem.h similarity index 100% rename from src/core/akonadiincidenceitem.h rename to attic/src/core/akonadiincidenceitem.h diff --git a/src/core/akonadinoteitem.cpp b/attic/src/core/akonadinoteitem.= cpp similarity index 100% rename from src/core/akonadinoteitem.cpp rename to attic/src/core/akonadinoteitem.cpp diff --git a/src/core/akonadinoteitem.h b/attic/src/core/akonadinoteitem.h similarity index 100% rename from src/core/akonadinoteitem.h rename to attic/src/core/akonadinoteitem.h diff --git a/src/core/datastoreinterface.cpp b/attic/src/core/datastoreinte= rface.cpp similarity index 100% rename from src/core/datastoreinterface.cpp rename to attic/src/core/datastoreinterface.cpp diff --git a/src/core/datastoreinterface.h b/attic/src/core/datastoreinterf= ace.h similarity index 100% rename from src/core/datastoreinterface.h rename to attic/src/core/datastoreinterface.h diff --git a/src/core/modelstack.cpp b/attic/src/core/modelstack.cpp similarity index 100% rename from src/core/modelstack.cpp rename to attic/src/core/modelstack.cpp diff --git a/src/core/modelstack.h b/attic/src/core/modelstack.h similarity index 100% rename from src/core/modelstack.h rename to attic/src/core/modelstack.h diff --git a/src/core/pimitem.cpp b/attic/src/core/pimitem.cpp similarity index 100% rename from src/core/pimitem.cpp rename to attic/src/core/pimitem.cpp diff --git a/src/core/pimitem.h b/attic/src/core/pimitem.h similarity index 100% rename from src/core/pimitem.h rename to attic/src/core/pimitem.h diff --git a/src/core/pimitemfactory.cpp b/attic/src/core/pimitemfactory.cpp similarity index 100% rename from src/core/pimitemfactory.cpp rename to attic/src/core/pimitemfactory.cpp diff --git a/src/core/pimitemfactory.h b/attic/src/core/pimitemfactory.h similarity index 100% rename from src/core/pimitemfactory.h rename to attic/src/core/pimitemfactory.h diff --git a/src/core/pimitemmodel.cpp b/attic/src/core/pimitemmodel.cpp similarity index 100% rename from src/core/pimitemmodel.cpp rename to attic/src/core/pimitemmodel.cpp diff --git a/src/core/pimitemmodel.h b/attic/src/core/pimitemmodel.h similarity index 100% rename from src/core/pimitemmodel.h rename to attic/src/core/pimitemmodel.h diff --git a/src/core/pimitemmonitor.cpp b/attic/src/core/pimitemmonitor.cpp similarity index 100% rename from src/core/pimitemmonitor.cpp rename to attic/src/core/pimitemmonitor.cpp diff --git a/src/core/pimitemmonitor.h b/attic/src/core/pimitemmonitor.h similarity index 100% rename from src/core/pimitemmonitor.h rename to attic/src/core/pimitemmonitor.h diff --git a/src/core/pimitemrelationcache.cpp b/attic/src/core/pimitemrela= tioncache.cpp similarity index 100% rename from src/core/pimitemrelationcache.cpp rename to attic/src/core/pimitemrelationcache.cpp diff --git a/src/core/pimitemrelationcache.h b/attic/src/core/pimitemrelati= oncache.h similarity index 100% rename from src/core/pimitemrelationcache.h rename to attic/src/core/pimitemrelationcache.h diff --git a/src/core/pimitemrelations.cpp b/attic/src/core/pimitemrelation= s.cpp similarity index 100% rename from src/core/pimitemrelations.cpp rename to attic/src/core/pimitemrelations.cpp diff --git a/src/core/pimitemrelations.h b/attic/src/core/pimitemrelations.h similarity index 100% rename from src/core/pimitemrelations.h rename to attic/src/core/pimitemrelations.h diff --git a/src/core/pimitemservices.cpp b/attic/src/core/pimitemservices.= cpp similarity index 100% rename from src/core/pimitemservices.cpp rename to attic/src/core/pimitemservices.cpp diff --git a/src/core/pimitemservices.h b/attic/src/core/pimitemservices.h similarity index 100% rename from src/core/pimitemservices.h rename to attic/src/core/pimitemservices.h diff --git a/src/core/pimitemstructurecache.cpp b/attic/src/core/pimitemstr= ucturecache.cpp similarity index 100% rename from src/core/pimitemstructurecache.cpp rename to attic/src/core/pimitemstructurecache.cpp diff --git a/src/core/pimitemstructurecache.h b/attic/src/core/pimitemstruc= turecache.h similarity index 100% rename from src/core/pimitemstructurecache.h rename to attic/src/core/pimitemstructurecache.h diff --git a/src/core/projectstrategy.cpp b/attic/src/core/projectstrategy.= cpp similarity index 100% rename from src/core/projectstrategy.cpp rename to attic/src/core/projectstrategy.cpp diff --git a/src/core/projectstrategy.h b/attic/src/core/projectstrategy.h similarity index 100% rename from src/core/projectstrategy.h rename to attic/src/core/projectstrategy.h diff --git a/src/core/structurecachestrategy.cpp b/attic/src/core/structure= cachestrategy.cpp similarity index 100% rename from src/core/structurecachestrategy.cpp rename to attic/src/core/structurecachestrategy.cpp diff --git a/src/core/structurecachestrategy.h b/attic/src/core/structureca= chestrategy.h similarity index 100% rename from src/core/structurecachestrategy.h rename to attic/src/core/structurecachestrategy.h diff --git a/src/core/todometadatamodel.cpp b/attic/src/core/todometadatamo= del.cpp similarity index 100% rename from src/core/todometadatamodel.cpp rename to attic/src/core/todometadatamodel.cpp diff --git a/src/core/todometadatamodel.h b/attic/src/core/todometadatamode= l.h similarity index 100% rename from src/core/todometadatamodel.h rename to attic/src/core/todometadatamodel.h diff --git a/src/core/virtualitem.cpp b/attic/src/core/virtualitem.cpp similarity index 100% rename from src/core/virtualitem.cpp rename to attic/src/core/virtualitem.cpp diff --git a/src/core/virtualitem.h b/attic/src/core/virtualitem.h similarity index 100% rename from src/core/virtualitem.h rename to attic/src/core/virtualitem.h diff --git a/src/globaldefs.h b/attic/src/globaldefs.h similarity index 100% rename from src/globaldefs.h rename to attic/src/globaldefs.h diff --git a/src/gui/CMakeLists.txt b/attic/src/gui/CMakeLists.txt similarity index 100% rename from src/gui/CMakeLists.txt rename to attic/src/gui/CMakeLists.txt diff --git a/src/gui/itemeditor/CMakeLists.txt b/attic/src/gui/itemeditor/C= MakeLists.txt similarity index 100% rename from src/gui/itemeditor/CMakeLists.txt rename to attic/src/gui/itemeditor/CMakeLists.txt diff --git a/src/gui/itemeditor/attachmentsviewer.cpp b/attic/src/gui/iteme= ditor/attachmentsviewer.cpp similarity index 100% rename from src/gui/itemeditor/attachmentsviewer.cpp rename to attic/src/gui/itemeditor/attachmentsviewer.cpp diff --git a/src/gui/itemeditor/attachmentsviewer.h b/attic/src/gui/itemedi= tor/attachmentsviewer.h similarity index 100% rename from src/gui/itemeditor/attachmentsviewer.h rename to attic/src/gui/itemeditor/attachmentsviewer.h diff --git a/src/gui/itemeditor/combomodel.cpp b/attic/src/gui/itemeditor/c= ombomodel.cpp similarity index 100% rename from src/gui/itemeditor/combomodel.cpp rename to attic/src/gui/itemeditor/combomodel.cpp diff --git a/src/gui/itemeditor/combomodel.h b/attic/src/gui/itemeditor/com= bomodel.h similarity index 100% rename from src/gui/itemeditor/combomodel.h rename to attic/src/gui/itemeditor/combomodel.h diff --git a/src/gui/itemeditor/editablewidget.cpp b/attic/src/gui/itemedit= or/editablewidget.cpp similarity index 100% rename from src/gui/itemeditor/editablewidget.cpp rename to attic/src/gui/itemeditor/editablewidget.cpp diff --git a/src/gui/itemeditor/editablewidget.h b/attic/src/gui/itemeditor= /editablewidget.h similarity index 100% rename from src/gui/itemeditor/editablewidget.h rename to attic/src/gui/itemeditor/editablewidget.h diff --git a/src/gui/itemeditor/editorui.rc b/attic/src/gui/itemeditor/edit= orui.rc similarity index 100% rename from src/gui/itemeditor/editorui.rc rename to attic/src/gui/itemeditor/editorui.rc diff --git a/src/gui/itemeditor/editorwidget.cpp b/attic/src/gui/itemeditor= /editorwidget.cpp similarity index 100% rename from src/gui/itemeditor/editorwidget.cpp rename to attic/src/gui/itemeditor/editorwidget.cpp diff --git a/src/gui/itemeditor/editorwidget.h b/attic/src/gui/itemeditor/e= ditorwidget.h similarity index 100% rename from src/gui/itemeditor/editorwidget.h rename to attic/src/gui/itemeditor/editorwidget.h diff --git a/src/gui/itemeditor/guiclient.cpp b/attic/src/gui/itemeditor/gu= iclient.cpp similarity index 100% rename from src/gui/itemeditor/guiclient.cpp rename to attic/src/gui/itemeditor/guiclient.cpp diff --git a/src/gui/itemeditor/guiclient.h b/attic/src/gui/itemeditor/guic= lient.h similarity index 100% rename from src/gui/itemeditor/guiclient.h rename to attic/src/gui/itemeditor/guiclient.h diff --git a/src/gui/itemeditor/itemeditor.cpp b/attic/src/gui/itemeditor/i= temeditor.cpp similarity index 100% rename from src/gui/itemeditor/itemeditor.cpp rename to attic/src/gui/itemeditor/itemeditor.cpp diff --git a/src/gui/itemeditor/itemeditor.h b/attic/src/gui/itemeditor/ite= meditor.h similarity index 100% rename from src/gui/itemeditor/itemeditor.h rename to attic/src/gui/itemeditor/itemeditor.h diff --git a/src/gui/itemeditor/itemview.ui b/attic/src/gui/itemeditor/item= view.ui similarity index 100% rename from src/gui/itemeditor/itemview.ui rename to attic/src/gui/itemeditor/itemview.ui diff --git a/src/gui/itemeditor/properties.ui b/attic/src/gui/itemeditor/pr= operties.ui similarity index 100% rename from src/gui/itemeditor/properties.ui rename to attic/src/gui/itemeditor/properties.ui diff --git a/src/gui/itemeditor/toolbox.cpp b/attic/src/gui/itemeditor/tool= box.cpp similarity index 100% rename from src/gui/itemeditor/toolbox.cpp rename to attic/src/gui/itemeditor/toolbox.cpp diff --git a/src/gui/itemeditor/toolbox.h b/attic/src/gui/itemeditor/toolbo= x.h similarity index 100% rename from src/gui/itemeditor/toolbox.h rename to attic/src/gui/itemeditor/toolbox.h diff --git a/src/gui/itemlist/CMakeLists.txt b/attic/src/gui/itemlist/CMake= Lists.txt similarity index 100% rename from src/gui/itemlist/CMakeLists.txt rename to attic/src/gui/itemlist/CMakeLists.txt diff --git a/src/gui/itemlist/actionduedatedelegate.cpp b/attic/src/gui/ite= mlist/actionduedatedelegate.cpp similarity index 100% rename from src/gui/itemlist/actionduedatedelegate.cpp rename to attic/src/gui/itemlist/actionduedatedelegate.cpp diff --git a/src/gui/itemlist/actionduedatedelegate.h b/attic/src/gui/iteml= ist/actionduedatedelegate.h similarity index 100% rename from src/gui/itemlist/actionduedatedelegate.h rename to attic/src/gui/itemlist/actionduedatedelegate.h diff --git a/src/gui/itemlist/actionlistcombobox.cpp b/attic/src/gui/itemli= st/actionlistcombobox.cpp similarity index 100% rename from src/gui/itemlist/actionlistcombobox.cpp rename to attic/src/gui/itemlist/actionlistcombobox.cpp diff --git a/src/gui/itemlist/actionlistcombobox.h b/attic/src/gui/itemlist= /actionlistcombobox.h similarity index 100% rename from src/gui/itemlist/actionlistcombobox.h rename to attic/src/gui/itemlist/actionlistcombobox.h diff --git a/src/gui/itemlist/actionlistdelegate.cpp b/attic/src/gui/itemli= st/actionlistdelegate.cpp similarity index 100% rename from src/gui/itemlist/actionlistdelegate.cpp rename to attic/src/gui/itemlist/actionlistdelegate.cpp diff --git a/src/gui/itemlist/actionlistdelegate.h b/attic/src/gui/itemlist= /actionlistdelegate.h similarity index 100% rename from src/gui/itemlist/actionlistdelegate.h rename to attic/src/gui/itemlist/actionlistdelegate.h diff --git a/src/gui/itemlist/actionlisteditor.cpp b/attic/src/gui/itemlist= /actionlisteditor.cpp similarity index 100% rename from src/gui/itemlist/actionlisteditor.cpp rename to attic/src/gui/itemlist/actionlisteditor.cpp diff --git a/src/gui/itemlist/actionlisteditor.h b/attic/src/gui/itemlist/a= ctionlisteditor.h similarity index 100% rename from src/gui/itemlist/actionlisteditor.h rename to attic/src/gui/itemlist/actionlisteditor.h diff --git a/src/gui/itemlist/actionlisteditorpage.cpp b/attic/src/gui/item= list/actionlisteditorpage.cpp similarity index 100% rename from src/gui/itemlist/actionlisteditorpage.cpp rename to attic/src/gui/itemlist/actionlisteditorpage.cpp diff --git a/src/gui/itemlist/actionlisteditorpage.h b/attic/src/gui/itemli= st/actionlisteditorpage.h similarity index 100% rename from src/gui/itemlist/actionlisteditorpage.h rename to attic/src/gui/itemlist/actionlisteditorpage.h diff --git a/src/gui/itemlist/filterproxymodel.cpp b/attic/src/gui/itemlist= /filterproxymodel.cpp similarity index 100% rename from src/gui/itemlist/filterproxymodel.cpp rename to attic/src/gui/itemlist/filterproxymodel.cpp diff --git a/src/gui/itemlist/filterproxymodel.h b/attic/src/gui/itemlist/f= ilterproxymodel.h similarity index 100% rename from src/gui/itemlist/filterproxymodel.h rename to attic/src/gui/itemlist/filterproxymodel.h diff --git a/src/gui/itemlist/itemselectorproxy.cpp b/attic/src/gui/itemlis= t/itemselectorproxy.cpp similarity index 100% rename from src/gui/itemlist/itemselectorproxy.cpp rename to attic/src/gui/itemlist/itemselectorproxy.cpp diff --git a/src/gui/itemlist/itemselectorproxy.h b/attic/src/gui/itemlist/= itemselectorproxy.h similarity index 100% rename from src/gui/itemlist/itemselectorproxy.h rename to attic/src/gui/itemlist/itemselectorproxy.h diff --git a/src/gui/itemlist/quickselectdialog.cpp b/attic/src/gui/itemlis= t/quickselectdialog.cpp similarity index 100% rename from src/gui/itemlist/quickselectdialog.cpp rename to attic/src/gui/itemlist/quickselectdialog.cpp diff --git a/src/gui/itemlist/quickselectdialog.h b/attic/src/gui/itemlist/= quickselectdialog.h similarity index 100% rename from src/gui/itemlist/quickselectdialog.h rename to attic/src/gui/itemlist/quickselectdialog.h diff --git a/src/gui/itemlist/searchbar.cpp b/attic/src/gui/itemlist/search= bar.cpp similarity index 100% rename from src/gui/itemlist/searchbar.cpp rename to attic/src/gui/itemlist/searchbar.cpp diff --git a/src/gui/itemlist/searchbar.h b/attic/src/gui/itemlist/searchba= r.h similarity index 100% rename from src/gui/itemlist/searchbar.h rename to attic/src/gui/itemlist/searchbar.h diff --git a/src/gui/shared/CMakeLists.txt b/attic/src/gui/shared/CMakeList= s.txt similarity index 100% rename from src/gui/shared/CMakeLists.txt rename to attic/src/gui/shared/CMakeLists.txt diff --git a/src/gui/shared/selectionproxymodel.cpp b/attic/src/gui/shared/= selectionproxymodel.cpp similarity index 100% rename from src/gui/shared/selectionproxymodel.cpp rename to attic/src/gui/shared/selectionproxymodel.cpp diff --git a/src/gui/shared/selectionproxymodel.h b/attic/src/gui/shared/se= lectionproxymodel.h similarity index 100% rename from src/gui/shared/selectionproxymodel.h rename to attic/src/gui/shared/selectionproxymodel.h diff --git a/src/gui/shared/todotreeview.cpp b/attic/src/gui/shared/todotre= eview.cpp similarity index 100% rename from src/gui/shared/todotreeview.cpp rename to attic/src/gui/shared/todotreeview.cpp diff --git a/src/gui/shared/todotreeview.h b/attic/src/gui/shared/todotreev= iew.h similarity index 100% rename from src/gui/shared/todotreeview.h rename to attic/src/gui/shared/todotreeview.h diff --git a/src/gui/sidebar/CMakeLists.txt b/attic/src/gui/sidebar/CMakeLi= sts.txt similarity index 100% rename from src/gui/sidebar/CMakeLists.txt rename to attic/src/gui/sidebar/CMakeLists.txt diff --git a/src/gui/sidebar/sidebar.cpp b/attic/src/gui/sidebar/sidebar.cpp similarity index 100% rename from src/gui/sidebar/sidebar.cpp rename to attic/src/gui/sidebar/sidebar.cpp diff --git a/src/gui/sidebar/sidebar.h b/attic/src/gui/sidebar/sidebar.h similarity index 100% rename from src/gui/sidebar/sidebar.h rename to attic/src/gui/sidebar/sidebar.h diff --git a/src/gui/sidebar/sidebarmodel.cpp b/attic/src/gui/sidebar/sideb= armodel.cpp similarity index 100% rename from src/gui/sidebar/sidebarmodel.cpp rename to attic/src/gui/sidebar/sidebarmodel.cpp diff --git a/src/gui/sidebar/sidebarmodel.h b/attic/src/gui/sidebar/sidebar= model.h similarity index 100% rename from src/gui/sidebar/sidebarmodel.h rename to attic/src/gui/sidebar/sidebarmodel.h diff --git a/src/gui/sidebar/sidebarpage.cpp b/attic/src/gui/sidebar/sideba= rpage.cpp similarity index 100% rename from src/gui/sidebar/sidebarpage.cpp rename to attic/src/gui/sidebar/sidebarpage.cpp diff --git a/src/gui/sidebar/sidebarpage.h b/attic/src/gui/sidebar/sidebarp= age.h similarity index 100% rename from src/gui/sidebar/sidebarpage.h rename to attic/src/gui/sidebar/sidebarpage.h diff --git a/src/icons/CMakeLists.txt b/attic/src/icons/CMakeLists.txt similarity index 100% rename from src/icons/CMakeLists.txt rename to attic/src/icons/CMakeLists.txt diff --git a/src/icons/hi128-apps-zanshin.png b/attic/src/icons/hi128-apps-= zanshin.png similarity index 100% rename from src/icons/hi128-apps-zanshin.png rename to attic/src/icons/hi128-apps-zanshin.png diff --git a/src/icons/hi256-apps-zanshin.png b/attic/src/icons/hi256-apps-= zanshin.png similarity index 100% rename from src/icons/hi256-apps-zanshin.png rename to attic/src/icons/hi256-apps-zanshin.png diff --git a/src/icons/hi32-apps-zanshin.png b/attic/src/icons/hi32-apps-za= nshin.png similarity index 100% rename from src/icons/hi32-apps-zanshin.png rename to attic/src/icons/hi32-apps-zanshin.png diff --git a/src/icons/hi64-apps-zanshin.png b/attic/src/icons/hi64-apps-za= nshin.png similarity index 100% rename from src/icons/hi64-apps-zanshin.png rename to attic/src/icons/hi64-apps-zanshin.png diff --git a/src/icons/hisc-apps-zanshin.svgz b/attic/src/icons/hisc-apps-z= anshin.svgz similarity index 100% rename from src/icons/hisc-apps-zanshin.svgz rename to attic/src/icons/hisc-apps-zanshin.svgz diff --git a/src/reparentingmodel/CMakeLists.txt b/attic/src/reparentingmod= el/CMakeLists.txt similarity index 100% rename from src/reparentingmodel/CMakeLists.txt rename to attic/src/reparentingmodel/CMakeLists.txt diff --git a/src/reparentingmodel/kbihash_p.h b/attic/src/reparentingmodel/= kbihash_p.h similarity index 100% rename from src/reparentingmodel/kbihash_p.h rename to attic/src/reparentingmodel/kbihash_p.h diff --git a/src/reparentingmodel/reparentingmodel.cpp b/attic/src/reparent= ingmodel/reparentingmodel.cpp similarity index 100% rename from src/reparentingmodel/reparentingmodel.cpp rename to attic/src/reparentingmodel/reparentingmodel.cpp diff --git a/src/reparentingmodel/reparentingmodel.h b/attic/src/reparentin= gmodel/reparentingmodel.h similarity index 100% rename from src/reparentingmodel/reparentingmodel.h rename to attic/src/reparentingmodel/reparentingmodel.h diff --git a/src/reparentingmodel/reparentingstrategy.cpp b/attic/src/repar= entingmodel/reparentingstrategy.cpp similarity index 100% rename from src/reparentingmodel/reparentingstrategy.cpp rename to attic/src/reparentingmodel/reparentingstrategy.cpp diff --git a/src/reparentingmodel/reparentingstrategy.h b/attic/src/reparen= tingmodel/reparentingstrategy.h similarity index 100% rename from src/reparentingmodel/reparentingstrategy.h rename to attic/src/reparentingmodel/reparentingstrategy.h diff --git a/src/reparentingmodel/todonode.cpp b/attic/src/reparentingmodel= /todonode.cpp similarity index 100% rename from src/reparentingmodel/todonode.cpp rename to attic/src/reparentingmodel/todonode.cpp diff --git a/src/reparentingmodel/todonode.h b/attic/src/reparentingmodel/t= odonode.h similarity index 100% rename from src/reparentingmodel/todonode.h rename to attic/src/reparentingmodel/todonode.h diff --git a/src/reparentingmodel/todonodemanager.cpp b/attic/src/reparenti= ngmodel/todonodemanager.cpp similarity index 100% rename from src/reparentingmodel/todonodemanager.cpp rename to attic/src/reparentingmodel/todonodemanager.cpp diff --git a/src/reparentingmodel/todonodemanager.h b/attic/src/reparenting= model/todonodemanager.h similarity index 100% rename from src/reparentingmodel/todonodemanager.h rename to attic/src/reparentingmodel/todonodemanager.h diff --git a/src/reparentingmodel/todoproxymodelbase.cpp b/attic/src/repare= ntingmodel/todoproxymodelbase.cpp similarity index 100% rename from src/reparentingmodel/todoproxymodelbase.cpp rename to attic/src/reparentingmodel/todoproxymodelbase.cpp diff --git a/src/reparentingmodel/todoproxymodelbase.h b/attic/src/reparent= ingmodel/todoproxymodelbase.h similarity index 100% rename from src/reparentingmodel/todoproxymodelbase.h rename to attic/src/reparentingmodel/todoproxymodelbase.h diff --git a/src/runner/CMakeLists.txt b/attic/src/runner/CMakeLists.txt similarity index 100% rename from src/runner/CMakeLists.txt rename to attic/src/runner/CMakeLists.txt diff --git a/src/runner/plasma-runner-zanshin.desktop b/attic/src/runner/pl= asma-runner-zanshin.desktop similarity index 100% rename from src/runner/plasma-runner-zanshin.desktop rename to attic/src/runner/plasma-runner-zanshin.desktop diff --git a/src/runner/zanshinrunner.cpp b/attic/src/runner/zanshinrunner.= cpp similarity index 100% rename from src/runner/zanshinrunner.cpp rename to attic/src/runner/zanshinrunner.cpp diff --git a/src/runner/zanshinrunner.h b/attic/src/runner/zanshinrunner.h similarity index 100% rename from src/runner/zanshinrunner.h rename to attic/src/runner/zanshinrunner.h diff --git a/src/todohelpers.cpp b/attic/src/todohelpers.cpp similarity index 100% rename from src/todohelpers.cpp rename to attic/src/todohelpers.cpp diff --git a/src/todohelpers.h b/attic/src/todohelpers.h similarity index 100% rename from src/todohelpers.h rename to attic/src/todohelpers.h diff --git a/src/utils/CMakeLists.txt b/attic/src/utils/CMakeLists.txt similarity index 57% copy from src/utils/CMakeLists.txt copy to attic/src/utils/CMakeLists.txt index 4d25b35..2cee4ac 100644 --- a/src/utils/CMakeLists.txt +++ b/attic/src/utils/CMakeLists.txt @@ -1,13 +1,11 @@ -set(utils_SRCS +set(oldutils_SRCS datestringbuilder.cpp - dependencymanager.cpp - jobhandler.cpp kdateedit.cpp kdatepickerpopup.cpp ) = -kde4_add_library(utils STATIC ${utils_SRCS}) -target_link_libraries(utils +kde4_add_library(oldutils STATIC ${oldutils_SRCS}) +target_link_libraries(oldutils ${KDE4_KDECORE_LIBS} ${KDEPIMLIBS_AKONADI_LIBS} ${QT_QTXML_LIBRARY} diff --git a/src/utils/datestringbuilder.cpp b/attic/src/utils/datestringbu= ilder.cpp similarity index 100% rename from src/utils/datestringbuilder.cpp rename to attic/src/utils/datestringbuilder.cpp diff --git a/src/utils/datestringbuilder.h b/attic/src/utils/datestringbuil= der.h similarity index 100% rename from src/utils/datestringbuilder.h rename to attic/src/utils/datestringbuilder.h diff --git a/src/utils/kdateedit.cpp b/attic/src/utils/kdateedit.cpp similarity index 100% rename from src/utils/kdateedit.cpp rename to attic/src/utils/kdateedit.cpp diff --git a/src/utils/kdateedit.h b/attic/src/utils/kdateedit.h similarity index 100% rename from src/utils/kdateedit.h rename to attic/src/utils/kdateedit.h diff --git a/src/utils/kdatepickerpopup.cpp b/attic/src/utils/kdatepickerpo= pup.cpp similarity index 100% rename from src/utils/kdatepickerpopup.cpp rename to attic/src/utils/kdatepickerpopup.cpp diff --git a/src/utils/kdatepickerpopup.h b/attic/src/utils/kdatepickerpopu= p.h similarity index 100% rename from src/utils/kdatepickerpopup.h rename to attic/src/utils/kdatepickerpopup.h diff --git a/tests/CMakeLists.txt b/attic/tests/CMakeLists.txt similarity index 96% copy from tests/CMakeLists.txt copy to attic/tests/CMakeLists.txt index 3bc9538..3750230 100644 --- a/tests/CMakeLists.txt +++ b/attic/tests/CMakeLists.txt @@ -1,6 +1,7 @@ add_subdirectory(testlib) = include_directories(${CMAKE_SOURCE_DIR}/src) +include_directories(${CMAKE_SOURCE_DIR}/attic/src) include_directories(${CMAKE_SOURCE_DIR}/3rdparty) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) = @@ -36,9 +37,6 @@ MACRO(ZANSHIN_AUTO_TESTS) ENDFOREACH(_testname) ENDMACRO(ZANSHIN_AUTO_TESTS) = -add_subdirectory(manual) -add_subdirectory(benchmarks) -add_subdirectory(units) ########### automated tests ############### = ZANSHIN_AUTO_TESTS( diff --git a/tests/modelstacktest.cpp b/attic/tests/modelstacktest.cpp similarity index 100% rename from tests/modelstacktest.cpp rename to attic/tests/modelstacktest.cpp diff --git a/tests/parentstructuremodelspec.cpp b/attic/tests/parentstructu= remodelspec.cpp similarity index 100% rename from tests/parentstructuremodelspec.cpp rename to attic/tests/parentstructuremodelspec.cpp diff --git a/tests/pimitemrelationstest.cpp b/attic/tests/pimitemrelationst= est.cpp similarity index 100% rename from tests/pimitemrelationstest.cpp rename to attic/tests/pimitemrelationstest.cpp diff --git a/tests/pimitemtest.cpp b/attic/tests/pimitemtest.cpp similarity index 100% rename from tests/pimitemtest.cpp rename to attic/tests/pimitemtest.cpp diff --git a/tests/reparentingmodelspec.cpp b/attic/tests/reparentingmodels= pec.cpp similarity index 100% rename from tests/reparentingmodelspec.cpp rename to attic/tests/reparentingmodelspec.cpp diff --git a/tests/selectionproxymodeltest.cpp b/attic/tests/selectionproxy= modeltest.cpp similarity index 100% rename from tests/selectionproxymodeltest.cpp rename to attic/tests/selectionproxymodeltest.cpp diff --git a/tests/sidebarmodelspec.cpp b/attic/tests/sidebarmodelspec.cpp similarity index 100% rename from tests/sidebarmodelspec.cpp rename to attic/tests/sidebarmodelspec.cpp diff --git a/tests/testlib/CMakeLists.txt b/attic/tests/testlib/CMakeLists.= txt similarity index 88% copy from tests/testlib/CMakeLists.txt copy to attic/tests/testlib/CMakeLists.txt index dccd29c..ebecd2e 100644 --- a/tests/testlib/CMakeLists.txt +++ b/attic/tests/testlib/CMakeLists.txt @@ -4,7 +4,6 @@ add_subdirectory(tests) ########### testlib ############### = set(zanshin_testlib_SRCS - akonadimocks.cpp c.cpp cat.cpp indent.cpp @@ -23,6 +22,7 @@ set(zanshin_testlib_SRCS g.cpp ) = +include_directories(${CMAKE_SOURCE_DIR}/attic/tests ${CMAKE_SOURCE_DIR}/at= tic/src) include_directories(${CMAKE_SOURCE_DIR}/tests ${CMAKE_SOURCE_DIR}/src) kde4_add_library(zanshin_testlib STATIC ${zanshin_testlib_SRCS}) target_link_libraries(zanshin_testlib ${KDE4_KDEUI_LIBS} ${KDEPIMLIBS_AKON= ADI_LIBS} ${KDEPIMLIBS_KCALCORE_LIBS} ${QT_QTTEST_LIBRARY}) diff --git a/tests/testlib/c.cpp b/attic/tests/testlib/c.cpp similarity index 100% rename from tests/testlib/c.cpp rename to attic/tests/testlib/c.cpp diff --git a/tests/testlib/c.h b/attic/tests/testlib/c.h similarity index 100% rename from tests/testlib/c.h rename to attic/tests/testlib/c.h diff --git a/tests/testlib/cat.cpp b/attic/tests/testlib/cat.cpp similarity index 100% rename from tests/testlib/cat.cpp rename to attic/tests/testlib/cat.cpp diff --git a/tests/testlib/cat.h b/attic/tests/testlib/cat.h similarity index 100% rename from tests/testlib/cat.h rename to attic/tests/testlib/cat.h diff --git a/tests/testlib/dsl.h b/attic/tests/testlib/dsl.h similarity index 100% rename from tests/testlib/dsl.h rename to attic/tests/testlib/dsl.h diff --git a/tests/testlib/g.cpp b/attic/tests/testlib/g.cpp similarity index 100% rename from tests/testlib/g.cpp rename to attic/tests/testlib/g.cpp diff --git a/tests/testlib/g.h b/attic/tests/testlib/g.h similarity index 100% rename from tests/testlib/g.h rename to attic/tests/testlib/g.h diff --git a/tests/testlib/helperutils.h b/attic/tests/testlib/helperutils.h similarity index 100% rename from tests/testlib/helperutils.h rename to attic/tests/testlib/helperutils.h diff --git a/tests/testlib/indent.cpp b/attic/tests/testlib/indent.cpp similarity index 100% rename from tests/testlib/indent.cpp rename to attic/tests/testlib/indent.cpp diff --git a/tests/testlib/indent.h b/attic/tests/testlib/indent.h similarity index 100% rename from tests/testlib/indent.h rename to attic/tests/testlib/indent.h diff --git a/tests/testlib/mockdatastore.cpp b/attic/tests/testlib/mockdata= store.cpp similarity index 100% rename from tests/testlib/mockdatastore.cpp rename to attic/tests/testlib/mockdatastore.cpp diff --git a/tests/testlib/mockdatastore.h b/attic/tests/testlib/mockdatast= ore.h similarity index 100% rename from tests/testlib/mockdatastore.h rename to attic/tests/testlib/mockdatastore.h diff --git a/tests/testlib/mockmodel.cpp b/attic/tests/testlib/mockmodel.cpp similarity index 100% rename from tests/testlib/mockmodel.cpp rename to attic/tests/testlib/mockmodel.cpp diff --git a/tests/testlib/mockmodel.h b/attic/tests/testlib/mockmodel.h similarity index 100% rename from tests/testlib/mockmodel.h rename to attic/tests/testlib/mockmodel.h diff --git a/tests/testlib/mockpimitem.cpp b/attic/tests/testlib/mockpimite= m.cpp similarity index 100% rename from tests/testlib/mockpimitem.cpp rename to attic/tests/testlib/mockpimitem.cpp diff --git a/tests/testlib/mockpimitem.h b/attic/tests/testlib/mockpimitem.h similarity index 100% rename from tests/testlib/mockpimitem.h rename to attic/tests/testlib/mockpimitem.h diff --git a/tests/testlib/modelbuilderbehavior.cpp b/attic/tests/testlib/m= odelbuilderbehavior.cpp similarity index 100% rename from tests/testlib/modelbuilderbehavior.cpp rename to attic/tests/testlib/modelbuilderbehavior.cpp diff --git a/tests/testlib/modelbuilderbehavior.h b/attic/tests/testlib/mod= elbuilderbehavior.h similarity index 100% rename from tests/testlib/modelbuilderbehavior.h rename to attic/tests/testlib/modelbuilderbehavior.h diff --git a/tests/testlib/modelnode.cpp b/attic/tests/testlib/modelnode.cpp similarity index 100% rename from tests/testlib/modelnode.cpp rename to attic/tests/testlib/modelnode.cpp diff --git a/tests/testlib/modelnode.h b/attic/tests/testlib/modelnode.h similarity index 100% rename from tests/testlib/modelnode.h rename to attic/tests/testlib/modelnode.h diff --git a/tests/testlib/modelpath.cpp b/attic/tests/testlib/modelpath.cpp similarity index 100% rename from tests/testlib/modelpath.cpp rename to attic/tests/testlib/modelpath.cpp diff --git a/tests/testlib/modelpath.h b/attic/tests/testlib/modelpath.h similarity index 100% rename from tests/testlib/modelpath.h rename to attic/tests/testlib/modelpath.h diff --git a/tests/testlib/modelstructure.cpp b/attic/tests/testlib/modelst= ructure.cpp similarity index 100% rename from tests/testlib/modelstructure.cpp rename to attic/tests/testlib/modelstructure.cpp diff --git a/tests/testlib/modelstructure.h b/attic/tests/testlib/modelstru= cture.h similarity index 100% rename from tests/testlib/modelstructure.h rename to attic/tests/testlib/modelstructure.h diff --git a/tests/testlib/modeltest.cpp b/attic/tests/testlib/modeltest.cpp similarity index 100% rename from tests/testlib/modeltest.cpp rename to attic/tests/testlib/modeltest.cpp diff --git a/tests/testlib/modeltest.h b/attic/tests/testlib/modeltest.h similarity index 100% rename from tests/testlib/modeltest.h rename to attic/tests/testlib/modeltest.h diff --git a/tests/testlib/modelutils.cpp b/attic/tests/testlib/modelutils.= cpp similarity index 100% rename from tests/testlib/modelutils.cpp rename to attic/tests/testlib/modelutils.cpp diff --git a/tests/testlib/modelutils.h b/attic/tests/testlib/modelutils.h similarity index 100% rename from tests/testlib/modelutils.h rename to attic/tests/testlib/modelutils.h diff --git a/tests/testlib/qcompare.cpp b/attic/tests/testlib/qcompare.cpp similarity index 100% rename from tests/testlib/qcompare.cpp rename to attic/tests/testlib/qcompare.cpp diff --git a/tests/testlib/qcompare.h b/attic/tests/testlib/qcompare.h similarity index 100% rename from tests/testlib/qcompare.h rename to attic/tests/testlib/qcompare.h diff --git a/tests/testlib/t.cpp b/attic/tests/testlib/t.cpp similarity index 100% rename from tests/testlib/t.cpp rename to attic/tests/testlib/t.cpp diff --git a/tests/testlib/t.h b/attic/tests/testlib/t.h similarity index 100% rename from tests/testlib/t.h rename to attic/tests/testlib/t.h diff --git a/tests/testlib/testlib.h b/attic/tests/testlib/testlib.h similarity index 100% rename from tests/testlib/testlib.h rename to attic/tests/testlib/testlib.h diff --git a/tests/testlib/tests/CMakeLists.txt b/attic/tests/testlib/tests= /CMakeLists.txt similarity index 100% rename from tests/testlib/tests/CMakeLists.txt rename to attic/tests/testlib/tests/CMakeLists.txt diff --git a/tests/testlib/tests/modelstructuretest.cpp b/attic/tests/testl= ib/tests/modelstructuretest.cpp similarity index 100% rename from tests/testlib/tests/modelstructuretest.cpp rename to attic/tests/testlib/tests/modelstructuretest.cpp diff --git a/tests/testlib/v.cpp b/attic/tests/testlib/v.cpp similarity index 100% rename from tests/testlib/v.cpp rename to attic/tests/testlib/v.cpp diff --git a/tests/testlib/v.h b/attic/tests/testlib/v.h similarity index 100% rename from tests/testlib/v.h rename to attic/tests/testlib/v.h diff --git a/tests/todocontextsmodelspec.cpp b/attic/tests/todocontextsmode= lspec.cpp similarity index 100% rename from tests/todocontextsmodelspec.cpp rename to attic/tests/todocontextsmodelspec.cpp diff --git a/tests/todometadatamodelspec.cpp b/attic/tests/todometadatamode= lspec.cpp similarity index 100% rename from tests/todometadatamodelspec.cpp rename to attic/tests/todometadatamodelspec.cpp diff --git a/tests/todotreemodelspec.cpp b/attic/tests/todotreemodelspec.cpp similarity index 100% rename from tests/todotreemodelspec.cpp rename to attic/tests/todotreemodelspec.cpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 44329fc..193cda5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,95 +1,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) = add_subdirectory(akonadi) -add_subdirectory(app) -add_subdirectory(core) add_subdirectory(domain) -add_subdirectory(gui) -add_subdirectory(icons) add_subdirectory(presentation) -add_subdirectory(reparentingmodel) -add_subdirectory(runner) add_subdirectory(utils) = -########### zanshin core ############### - -set(zanshin_core_SRCS - todohelpers.cpp - ${core_SRCS} - ${gui_SRCS} - ${reparentingmodel_SRCS} -) - -set(zanshin_core_LIBS - ${KDEPIMLIBS_AKONADI_LIBS} - ${KDEPIMLIBS_KCALCORE_LIBS} - ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS} - akonadi - domain - kio - utils -) - -########### zanshin gui ############### - -set(zanshin_gui_SRCS - ${gui_SRCS} -) - -kde4_add_ui_files(zanshin_gui_SRCS gui/itemeditor/itemview.ui) -kde4_add_ui_files(zanshin_gui_SRCS gui/itemeditor/properties.ui) - -########### zanshin app ############### - -set(zanshin_SRCS - ${app_SRCS} - ${mainApp_SRCS} - ${zanshin_core_SRCS} - ${zanshin_gui_SRCS} -) - - -kde4_add_app_icon(zanshin_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-apps= -zanshin.png") -kde4_add_executable(zanshin ${zanshin_SRCS}) -target_link_libraries(zanshin ${KDE4_KDEUI_LIBS} ${zanshin_core_LIBS}) - -install(TARGETS zanshin DESTINATION ${BIN_INSTALL_DIR}) -install(FILES app/zanshinui.rc DESTINATION ${DATA_INSTALL_DIR}/zanshin) -install(FILES gui/itemeditor/editorui.rc DESTINATION ${DATA_INSTALL_DIR}/z= anshin) -install(PROGRAMS app/zanshin.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) - -########### zanshin part ############### - -set(zanshin_part_SRCS - ${app_SRCS} - ${partApp_SRCS} - ${zanshin_core_SRCS} - ${zanshin_gui_SRCS} -) - -kde4_add_plugin(zanshin_part ${zanshin_part_SRCS}) -target_link_libraries(zanshin_part ${KDE4_KPARTS_LIBS} ${zanshin_core_LIBS= }) - -install(TARGETS zanshin_part DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES app/zanshin_part.rc DESTINATION ${DATA_INSTALL_DIR}/zanshin) -install(FILES app/zanshin_part.desktop DESTINATION ${SERVICES_INSTALL_DIR}) - -########### kontact zanshin plugin ############### - -set(kontact_zanshinplugin_SRCS - app/kontact_plugin.cpp -) - -kde4_add_plugin(kontact_zanshinplugin ${kontact_zanshinplugin_SRCS}) -target_link_libraries(kontact_zanshinplugin ${KDE4_KPARTS_LIBS} ${KDEPIMLI= BS_KONTACTINTERFACE_LIBS}) - -install(TARGETS kontact_zanshinplugin DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES app/zanshin_plugin.desktop DESTINATION ${SERVICES_INSTALL_DI= R}/kontact) - -########### zanshin static version ############### - -if(KDE4_BUILD_TESTS) - kde4_add_library(zanshin_static STATIC ${zanshin_core_SRCS}) - target_link_libraries(zanshin_static ${KDE4_KDEUI_LIBS} ${zanshin_core_= LIBS}) - add_dependencies(zanshin_static zanshin) -endif() diff --git a/src/akonadi/CMakeLists.txt b/src/akonadi/CMakeLists.txt index 1a98d8b..62b4475 100644 --- a/src/akonadi/CMakeLists.txt +++ b/src/akonadi/CMakeLists.txt @@ -13,4 +13,8 @@ set(akonadi_SRCS ) = kde4_add_library(akonadi STATIC ${akonadi_SRCS}) -target_link_libraries(akonadi ${QT4_QTCORE_LIBRARY}) +target_link_libraries(akonadi + ${KDEPIMLIBS_AKONADI_LIBS} + ${KDEPIMLIBS_AKONADI_NOTES_LIBS} + ${KDEPIMLIBS_KCALCORE_LIBS} +) diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt index 4d25b35..ff83004 100644 --- a/src/utils/CMakeLists.txt +++ b/src/utils/CMakeLists.txt @@ -1,16 +1,9 @@ set(utils_SRCS - datestringbuilder.cpp dependencymanager.cpp jobhandler.cpp - kdateedit.cpp - kdatepickerpopup.cpp ) = kde4_add_library(utils STATIC ${utils_SRCS}) target_link_libraries(utils ${KDE4_KDECORE_LIBS} - ${KDEPIMLIBS_AKONADI_LIBS} - ${QT_QTXML_LIBRARY} - akonadi-notes -# kmime ) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3bc9538..97491de 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,5 +1,3 @@ -add_subdirectory(testlib) - include_directories(${CMAKE_SOURCE_DIR}/src) include_directories(${CMAKE_SOURCE_DIR}/3rdparty) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) @@ -8,14 +6,13 @@ MACRO(ZANSHIN_MANUAL_TESTS) FOREACH(_testname ${ARGN}) kde4_add_executable(${_testname} TEST ${_testname}.cpp) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") - target_link_libraries(${_testname} ${KDE4_KDEUI_LIBS} ${KDEPIMLIBS_AKO= NADI_LIBS} - ${KDEPIMLIBS_KCALCORE_LIBS} ${QT_QT= TEST_LIBRARY} - zanshin_static - zanshin_testlib - akonadi - domain - presentation - utils + target_link_libraries(${_testname} + ${QT_QTTEST_LIBRARY} + ${KDE4_KDEUI_LIBS} + akonadi + domain + presentation + utils ) ENDFOREACH(_testname) ENDMACRO(ZANSHIN_MANUAL_TESTS) @@ -24,33 +21,18 @@ MACRO(ZANSHIN_AUTO_TESTS) FOREACH(_testname ${ARGN}) kde4_add_unit_test(${_testname} TESTNAME zanshin-${_testname} ${_testn= ame}.cpp) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") - target_link_libraries(${_testname} ${KDE4_KDEUI_LIBS} ${KDEPIMLIBS_AKO= NADI_LIBS} - ${KDEPIMLIBS_KCALCORE_LIBS} ${QT_QT= TEST_LIBRARY} - zanshin_static - zanshin_testlib - akonadi - domain - presentation - utils + target_link_libraries(${_testname} + ${QT_QTTEST_LIBRARY} + akonadi + domain + presentation + testlib + utils ) ENDFOREACH(_testname) ENDMACRO(ZANSHIN_AUTO_TESTS) = add_subdirectory(manual) add_subdirectory(benchmarks) +add_subdirectory(testlib) add_subdirectory(units) -########### automated tests ############### - -ZANSHIN_AUTO_TESTS( - modelstacktest - selectionproxymodeltest - sidebarmodelspec -# todocontextsmodelspec -# todometadatamodelspec -# todotreemodelspec - parentstructuremodelspec - reparentingmodelspec - pimitemrelationstest - pimitemtest -) - diff --git a/tests/testlib/CMakeLists.txt b/tests/testlib/CMakeLists.txt index dccd29c..9a852a2 100644 --- a/tests/testlib/CMakeLists.txt +++ b/tests/testlib/CMakeLists.txt @@ -1,29 +1,8 @@ -# Even the test lib needs to be tested. ;-) -add_subdirectory(tests) - -########### testlib ############### - -set(zanshin_testlib_SRCS +set(testlib_SRCS akonadimocks.cpp - c.cpp - cat.cpp - indent.cpp - mockdatastore.cpp - mockmodel.cpp - mockpimitem.cpp - modelbuilderbehavior.cpp - modelnode.cpp - modelpath.cpp - modelstructure.cpp - modeltest.cpp - modelutils.cpp - qcompare.cpp - t.cpp - v.cpp - g.cpp ) = include_directories(${CMAKE_SOURCE_DIR}/tests ${CMAKE_SOURCE_DIR}/src) -kde4_add_library(zanshin_testlib STATIC ${zanshin_testlib_SRCS}) -target_link_libraries(zanshin_testlib ${KDE4_KDEUI_LIBS} ${KDEPIMLIBS_AKON= ADI_LIBS} ${KDEPIMLIBS_KCALCORE_LIBS} ${QT_QTTEST_LIBRARY}) +kde4_add_library(testlib STATIC ${testlib_SRCS}) +target_link_libraries(testlib ${KDE4_KDEUI_LIBS} ${KDEPIMLIBS_AKONADI_LIBS= } ${KDEPIMLIBS_KCALCORE_LIBS} ${QT_QTTEST_LIBRARY}) = diff --git a/tests/units/akonadi/CMakeLists.txt b/tests/units/akonadi/CMake= Lists.txt index 88cde30..4393932 100644 --- a/tests/units/akonadi/CMakeLists.txt +++ b/tests/units/akonadi/CMakeLists.txt @@ -4,10 +4,9 @@ MACRO(ZANSHIN_AKONADI_AUTO_TESTS) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") target_link_libraries(${_testname} ${KDE4_KDEUI_LIBS} ${KDEPIMLIBS_AKO= NADI_LIBS} ${KDEPIMLIBS_KCALCORE_LIBS} ${QT_QT= TEST_LIBRARY} - zanshin_static - zanshin_testlib akonadi domain + utils ) = get_target_property(_location ${_testname} LOCATION)