Differential D24496 Diff 68261 src/core/kemailsettings.cpp

Changeset View

Standalone View

View Options

src/core/kemailsettings.cpp

Show First 20 Lines • Show All 72 Lines • ▼ Show 20 Line(s)72 case OutServer: {
73 return cg.readEntry("OutgoingServer"); 73​ return cg.readEntry("OutgoingServer");
74 } 74​ }
75 case OutServerLogin: { 75​ case OutServerLogin: {
76 return cg.readEntry("OutgoingUserName"); 76​ return cg.readEntry("OutgoingUserName");
77 } 77​ }
78 case OutServerPass: { 78​ case OutServerPass: {
79 return cg.readEntry("OutgoingPassword"); 79​ return cg.readEntry("OutgoingPassword");
80 } 80​ }
81​#if KCONFIGCORE_BUILD_DEPRECATED_SINCE(5, 0)
81 case OutServerType: { 82​ case OutServerType: {
82 return cg.readEntry("OutgoingServerType"); 83​ return cg.readEntry("OutgoingServerType");
83 } 84​ }
84 case OutServerCommand: { 85​ case OutServerCommand: {
85 return cg.readEntry("OutgoingCommand"); 86​ return cg.readEntry("OutgoingCommand");
86 } 87​ }
87 case OutServerTLS: { 88​ case OutServerTLS: {
88 return cg.readEntry("OutgoingServerTLS", QVariant(false)).toString(); 89​ return cg.readEntry("OutgoingServerTLS", QVariant(false)).toString();
89 } 90​ }
91​#else
92​ case OutServerType_DEPRECATED_DO_NOT_USE:
93​ case OutServerCommand_DEPRECATED_DO_NOT_USE:
94​ case OutServerTLS_DEPRECATED_DO_NOT_USE:
95​ break;
96​#endif
90 case InServer: { 97​ case InServer: {
91 return cg.readEntry("IncomingServer"); 98​ return cg.readEntry("IncomingServer");
92 } 99​ }
93 case InServerLogin: { 100​ case InServerLogin: {
94 return cg.readEntry("IncomingUserName"); 101​ return cg.readEntry("IncomingUserName");
95 } 102​ }
96 case InServerPass: { 103​ case InServerPass: {
97 return cg.readEntry("IncomingPassword"); 104​ return cg.readEntry("IncomingPassword");
98 } 105​ }
106​#if KCONFIGCORE_BUILD_DEPRECATED_SINCE(5, 0)
99 case InServerType: { 107​ case InServerType: {
100 return cg.readEntry("IncomingServerType"); 108​ return cg.readEntry("IncomingServerType");
101 } 109​ }
102 case InServerMBXType: { 110​ case InServerMBXType: {
103 return cg.readEntry("IncomingServerMBXType"); 111​ return cg.readEntry("IncomingServerMBXType");
104 } 112​ }
105 case InServerTLS: { 113​ case InServerTLS: {
106 return cg.readEntry("IncomingServerTLS", QVariant(false)).toString(); 114​ return cg.readEntry("IncomingServerTLS", QVariant(false)).toString();
107 } 115​ }
116​#endif
108 }; 117​ };
109 return QString(); 118​ return QString();
110} 119​}
111void KEMailSettings::setSetting(KEMailSettings::Setting s, const QString &v) 120​void KEMailSettings::setSetting(KEMailSettings::Setting s, const QString &v)
112{ 121​{
113 KConfigGroup cg(p->m_pConfig, QLatin1String("PROFILE_") + p->m_sCurrentProfile); 122​ KConfigGroup cg(p->m_pConfig, QLatin1String("PROFILE_") + p->m_sCurrentProfile);
114 switch (s) { 123​ switch (s) {
115 case ClientProgram: { 124​ case ClientProgram: {
Show All 27 Lines
143 case OutServerLogin: { 152​ case OutServerLogin: {
144 cg.writeEntry("OutgoingUserName", v); 153​ cg.writeEntry("OutgoingUserName", v);
145 break; 154​ break;
146 } 155​ }
147 case OutServerPass: { 156​ case OutServerPass: {
148 cg.writeEntry("OutgoingPassword", v); 157​ cg.writeEntry("OutgoingPassword", v);
149 break; 158​ break;
150 } 159​ }
160​#if KCONFIGCORE_BUILD_DEPRECATED_SINCE(5, 0)
151 case OutServerType: { 161​ case OutServerType: {
152 cg.writeEntry("OutgoingServerType", v); 162​ cg.writeEntry("OutgoingServerType", v);
153 break; 163​ break;
154 } 164​ }
155 case OutServerCommand: { 165​ case OutServerCommand: {
156 cg.writeEntry("OutgoingCommand", v); 166​ cg.writeEntry("OutgoingCommand", v);
157 break; 167​ break;
158 } 168​ }
159 case OutServerTLS: { 169​ case OutServerTLS: {
160 cg.writeEntry("OutgoingServerTLS", (v == QLatin1String("true"))); 170​ cg.writeEntry("OutgoingServerTLS", (v == QLatin1String("true")));
161 break; 171​ break;
162 } 172​ }
173​#else
174​ case OutServerType_DEPRECATED_DO_NOT_USE:
175​ case OutServerCommand_DEPRECATED_DO_NOT_USE:
176​ case OutServerTLS_DEPRECATED_DO_NOT_USE:
177​ break;
178​#endif
163 case InServer: { 179​ case InServer: {
164 cg.writeEntry("IncomingServer", v); 180​ cg.writeEntry("IncomingServer", v);
165 break; 181​ break;
166 } 182​ }
167 case InServerLogin: { 183​ case InServerLogin: {
168 cg.writeEntry("IncomingUserName", v); 184​ cg.writeEntry("IncomingUserName", v);
169 break; 185​ break;
170 } 186​ }
171 case InServerPass: { 187​ case InServerPass: {
172 cg.writeEntry("IncomingPassword", v); 188​ cg.writeEntry("IncomingPassword", v);
173 break; 189​ break;
174 } 190​ }
191​#if KCONFIGCORE_BUILD_DEPRECATED_SINCE(5, 0)
175 case InServerType: { 192​ case InServerType: {
176 cg.writeEntry("IncomingServerType", v); 193​ cg.writeEntry("IncomingServerType", v);
177 break; 194​ break;
178 } 195​ }
179 case InServerMBXType: { 196​ case InServerMBXType: {
180 cg.writeEntry("IncomingServerMBXType", v); 197​ cg.writeEntry("IncomingServerMBXType", v);
181 break; 198​ break;
182 } 199​ }
183 case InServerTLS: { 200​ case InServerTLS: {
184 cg.writeEntry("IncomingServerTLS", (v == QLatin1String("true"))); 201​ cg.writeEntry("IncomingServerTLS", (v == QLatin1String("true")));
185 break; 202​ break;
186 } 203​ }
204​#endif
187 }; 205​ };
188 cg.sync(); 206​ cg.sync();
189} 207​}
190 208​
191void KEMailSettings::setDefault(const QString &s) 209​void KEMailSettings::setDefault(const QString &s)
192{ 210​{
193 p->m_pConfig->group("Defaults").writeEntry("Profile", s); 211​ p->m_pConfig->group("Defaults").writeEntry("Profile", s);
194 p->m_pConfig->sync(); 212​ p->m_pConfig->sync();
195 p->m_sDefaultProfile = s; 213​ p->m_sDefaultProfile = s;
196 214​
197} 215​}
198 216​
199void KEMailSettings::setProfile(const QString &s) 217​void KEMailSettings::setProfile(const QString &s)
200{ 218​{
201 const QString groupname = QLatin1String("PROFILE_") + s; 219​ const QString groupname = QLatin1String("PROFILE_") + s;
202 p->m_sCurrentProfile = s; 220​ p->m_sCurrentProfile = s;
203 if (!p->m_pConfig->hasGroup(groupname)) { // Create a group if it doesn't exist 221​ if (!p->m_pConfig->hasGroup(groupname)) { // Create a group if it doesn't exist
204 KConfigGroup cg(p->m_pConfig, groupname); 222​ KConfigGroup cg(p->m_pConfig, groupname);
205 cg.writeEntry("ServerType", QString()); 223​ cg.writeEntry("ServerType", QString());
206 p->profiles += s; 224​ p->profiles += s;
207 } 225​ }
208} 226​}
209 227​
210#ifndef KDE_NO_DEPRECATED 228​#if KCONFIGCORE_BUILD_DEPRECATED_SINCE(5, 0)
211QString KEMailSettings::currentProfileName() const 229​QString KEMailSettings::currentProfileName() const
212{ 230​{
213 return p->m_sCurrentProfile; 231​ return p->m_sCurrentProfile;
214} 232​}
215#endif 233​#endif
216 234​
217QStringList KEMailSettings::profiles() const 235​QStringList KEMailSettings::profiles() const
218{ 236​{
Show All 39 Lines