Changeset 14194


Ignore:
Timestamp:
Sep 8, 2013, 6:39:37 PM (9 years ago)
Author:
jordan
Message:

fix CL warnings in the Qt code. mikedld

Location:
trunk/qt
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/qt/formatter.h

    r14185 r14194  
    1717#include <QObject>
    1818#include <QIcon>
     19
     20#include <stdint.h> // int64_t
    1921
    2022class Speed;

  • trunk/qt/freespace-label.h

    r14185 r14194  
    1414#define QTR_FREESPACE_LABEL_H
    1515
     16#include <stdint.h>
     17
    1618#include <QString>
    1719#include <QTimer>
    18 
    1920#include <QLabel>
    2021

  • trunk/qt/make-dialog.h

    r14176 r14194  
    1717#include <QTimer>
    1818
    19 struct QAbstractButton;
    20 struct QPlainTextEdit;
    21 struct QLineEdit;
    22 struct QCheckBox;
    23 struct QLabel;
    24 struct QPushButton;
    25 struct QRadioButton;
    26 struct Session;
    27 struct QProgressBar;
    28 struct QDialogButtonBox;
     19class QAbstractButton;
     20class QPlainTextEdit;
     21class QLineEdit;
     22class QCheckBox;
     23class QLabel;
     24class QPushButton;
     25class QRadioButton;
     26class Session;
     27class QProgressBar;
     28class QDialogButtonBox;
    2929
    3030extern "C"

  • trunk/qt/options.cc

    r14185 r14194  
    1010 * $Id$
    1111 */
     12
     13#include <algorithm> // std::min()
    1214
    1315#include <QApplication>

  • trunk/qt/torrent-filter.cc

    r13896 r14194  
    212212TorrentFilter :: countTorrentsPerMode (int * setmeCounts) const
    213213{
    214   std::fill_n (setmeCounts, FilterMode::NUM_MODES, 0);
     214  std::fill_n (setmeCounts, static_cast<std::size_t>(FilterMode::NUM_MODES), 0);
    215215
    216216  for (int row(0); ; ++row)

  • trunk/qt/torrent.h

    r14185 r14194  
    2929#include "speed.h"
    3030#include "types.h"
     31
     32#ifdef ERROR
     33 #undef ERROR
     34#endif
    3135
    3236extern "C"

  • trunk/qt/tracker-delegate.h

    r11522 r14194  
    1111 */
    1212
    13 #ifndef QTR_TORRENT_DELEGATE_H
    14 #define QTR_TORRENT_DELEGATE_H
     13#ifndef QTR_TRACKER_DELEGATE_H
     14#define QTR_TRACKER_DELEGATE_H
    1515
    1616#include <QItemDelegate>
    … …  
    2121class QStyle;
    2222class Session;
    23 class TrackerInfo;
     23struct TrackerInfo;
    2424
    2525class TrackerDelegate: public QItemDelegate
Note: See TracChangeset for help on using the changeset viewer.