void ConflictHandler::resolve() { ConflictResolveDialog dlg; dlg.setConflictingItems( mChangedItem, mConflictingItem ); dlg.exec(); const ResolveStrategy strategy = dlg.resolveStrategy(); switch ( strategy ) { case UseLocalItem: useLocalItem(); break; case UseOtherItem: useOtherItem(); break; case UseBothItems: useBothItems(); break; } }
void ConflictHandler::resolve() { #pragma message ("warning KF5 Port me!") #if 0 ConflictResolveDialog dlg; dlg.setConflictingItems(mChangedItem, mConflictingItem); dlg.exec(); const ResolveStrategy strategy = dlg.resolveStrategy(); switch (strategy) { case UseLocalItem: useLocalItem(); break; case UseOtherItem: useOtherItem(); break; case UseBothItems: useBothItems(); break; } #endif }