← Back to branch summary

~ubuntu-branches/ubuntu/wily/sflphone/wily

« back to all changes in this revision

Viewing changes to kde/src/lib/keyexchangemodel.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2015-01-07 14:51:16 UTC
  • mfrom: (4.3.5 sid)
  • Revision ID: package-import@ubuntu.com-20150107145116-yxnafinf4lrdvrmx
Tags: 1.4.1-0.1ubuntu1
* Merge with Debian, remaining changes:
 - Drop soprano, nepomuk build-dep
* Drop ubuntu patches, now upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
kde/src/lib/keyexchangemodel.cpp
49
49
         case KeyExchangeModel::Type::SDES:
50
50
            return KeyExchangeModel::Name::SDES;
51
51
            break;
52
 
         case KeyExchangeModel::Type::COUNT:
 
52
         case KeyExchangeModel::Type::__COUNT:
53
53
            break;
54
54
      };
55
55
   }
94
94
      case KeyExchangeModel::Type::SDES:
95
95
         return KeyExchangeModel::DaemonName::SDES;
96
96
         break;
97
 
      case KeyExchangeModel::Type::COUNT:
 
97
      case KeyExchangeModel::Type::__COUNT:
98
98
         break;
99
99
   };
100
100
   return nullptr; //Cannot heppen