← Back to branch summary

~ubuntu-branches/ubuntu/vivid/kdepim/vivid

« back to all changes in this revision

Viewing changes to kmailcvt/kmailcvt.cpp

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman, Jonathan Riddell, Rohan Garg, Scott Kitterman
  • Date: 2012-11-21 13:12:36 UTC
  • mfrom: (0.2.33)
  • Revision ID: package-import@ubuntu.com-20121121131236-32ijw9a2txrar80k
Tags: 4:4.9.80-0ubuntu1
[ Jonathan Riddell ]
* New upstream beta release

[ Rohan Garg ]
* Add nepomuk-core-dev to build-deps

[ Scott Kitterman ]
* Add new package, libpimcommon4
  - Add libpimcommon4.install
  - Add to debian/control, including kdepim-dbg and kdepim-dev depends
  - Add to kdepim-dev.install
* Remove usr/bin/backupmail and related files from kmail.install as they are
  not provided by upstream anymore
* Add usr/bin/pimsettingexporter and related files to kmail.install
* Add libnepomukwidgets-dev to build-depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
kmailcvt/kmailcvt.cpp
60
60
  // Disable the 'next button to begin with.
61
61
  setValid( currentPage(), false );
62
62
 
63
 
  connect( selfilterpage->mWidget->mCollectionRequestor, SIGNAL(folderChanged(Akonadi::Collection)),
 
63
  connect( selfilterpage->widget()->mCollectionRequestor, SIGNAL(folderChanged(Akonadi::Collection)),
64
64
           this, SLOT(collectionChanged(Akonadi::Collection)) );
65
65
  Akonadi::Control::widgetNeedsAkonadi(this);
66
66
  readConfig();
75
75
{
76
76
  KConfigGroup group( KGlobal::config(), "FolderSelectionDialog" );
77
77
  if ( group.hasKey( "LastSelectedFolder" ) ) {
78
 
     selfilterpage->mWidget->mCollectionRequestor->setCollection( CommonKernel->collectionFromId(group.readEntry("LastSelectedFolder", -1 )));
 
78
     selfilterpage->widget()->mCollectionRequestor->setCollection( CommonKernel->collectionFromId(group.readEntry("LastSelectedFolder", -1 )));
79
79
  }
80
80
}
81
81
 
82
82
void KMailCVT::writeConfig()
83
83
{
84
84
  KConfigGroup group( KGlobal::config(), "FolderSelectionDialog" );
85
 
  group.writeEntry( "LastSelectedFolder", selfilterpage->mWidget->mCollectionRequestor->collection().id() );
 
85
  group.writeEntry( "LastSelectedFolder", selfilterpage->widget()->mCollectionRequestor->collection().id() );
86
86
  group.sync();
87
87
}
88
88
 
91
91
  if( currentPage() == page1 ){
92
92
    // Save selected filter
93
93
    Filter *selectedFilter = selfilterpage->getSelectedFilter();
94
 
    Akonadi::Collection selectedCollection = selfilterpage->mWidget->mCollectionRequestor->collection();
 
94
    Akonadi::Collection selectedCollection = selfilterpage->widget()->mCollectionRequestor->collection();
95
95
    // without filter don't go next
96
96
    if ( !selectedFilter )
97
97
      return;