← Back to branch summary

~ubuntu-branches/ubuntu/trusty/kvirc/trusty

« back to all changes in this revision

Viewing changes to src/kvirc/ui/KviIrcView_loghandling.cpp

  • Committer: Package Import Robot
  • Author(s): Kai Wasserbäch
  • Date: 2011-09-29 16:27:07 UTC
  • mfrom: (0.3.15 upstream)
  • Revision ID: package-import@ubuntu.com-20110929162707-t29s6itjnsg2syuf
Tags: 4:4.1.3+20110929.svn5980-1
The "Balance of Power" release.

* Synced to upstream's SVN revision 5980.
* debian/control:
  - Vcs-* fields updated.
  - Remove libcrypto++-dev from B-Ds, was dropped upstream.
  - Bumped B-D on debhelper to >= 8.9.4.
* debian/rules:
  - Remove a now obsolete flag.
  - Upstream fixed a typo in a configuration variable name (now
    WANT_COEXISTENCE), updated invocation.
* debian/compat: Now at 9.
* Make KVIrc multiarch ready:
  - debian/{kvirc,libkvilib4,kvirc-modules}.install: Split out binaries
    under /usr/lib.
  - debian/rules: Add -DLIB_SUFFIX to dh_auto_configure invocation.
  - debian/control:
    + Added new packages (needed for split).
    + Added Multi-Arch fields
    + Added Pre-Depends: multiarch-support and ${misc:Pre-Depends} where
      needed.
    + Bumped B-D on CMake.
  - debian/{kvirc,libkvilib4,kvirc-modules}.lintian-overrides: Moved and
    updated overrides to match new locations (one could be dropped in the
    process).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/kvirc/ui/KviIrcView_loghandling.cpp
42
42
#include <QFile>
43
43
#include <QDateTime>
44
44
#include <QTextCodec>
 
45
#include <QLocale>
45
46
 
46
47
void KviIrcView::stopLogging()
47
48
{
52
53
                switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat))
53
54
                {
54
55
                        case 0:
55
 
                                szDate = date.toString();
 
56
                                // this is the equivalent to an empty date.toString() call, but it's needed
 
57
                                // to ensure qt4 will use the default() locale and not the system() one
 
58
                                szDate = QLocale().toString(date, "ddd MMM d hh:mm:ss yyyy");
56
59
                                break;
57
60
                        case 1:
58
61
                                szDate = date.toString(Qt::ISODate);
59
62
                                break;
60
63
                        case 2:
61
 
                                szDate = date.toString(Qt::SystemLocaleDate);
 
64
                                szDate = date.toString(Qt::SystemLocaleShortDate);
62
65
                                break;
63
66
                }
64
67
                
220
223
        switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat))
221
224
        {
222
225
                case 0:
223
 
                        szDate = date.toString();
 
226
                        // this is the equivalent to an empty date.toString() call, but it's needed
 
227
                        // to ensure qt4 will use the default() locale and not the system() one
 
228
                        szDate = QLocale().toString(date, "ddd MMM d hh:mm:ss yyyy");
224
229
                        break;
225
230
                case 1:
226
231
                        szDate = date.toString(Qt::ISODate);
227
232
                        break;
228
233
                case 2:
229
 
                        szDate = date.toString(Qt::SystemLocaleDate);
 
234
                        szDate = date.toString(Qt::SystemLocaleShortDate);
230
235
                        break;
231
236
        }
232
237
        
273
278
                                szDate = date.toString(Qt::ISODate);
274
279
                        break;
275
280
                        case 2:
276
 
                                szDate = date.toString(Qt::SystemLocaleDate);
 
281
                                szDate = date.toString(Qt::SystemLocaleShortDate);
277
282
                        break;
278
283
                }
279
284