Remove all trailing spaces
No real changes, just clean up sources by removing trailing spaces from all the non-generated files. This should hopefully avoid future commits mixing significant changes with insignificant whitespace ones.
This commit is contained in:
@@ -52,8 +52,8 @@ protected:
|
||||
// ref counting code
|
||||
virtual wxObjectRefData *CreateRefData() const;
|
||||
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
|
||||
|
||||
private:
|
||||
|
||||
private:
|
||||
wxDECLARE_DYNAMIC_CLASS(wxAcceleratorTable);
|
||||
};
|
||||
|
||||
|
@@ -15,15 +15,15 @@ class WXDLLIMPEXP_CORE wxApp : public wxAppBase
|
||||
public:
|
||||
wxApp();
|
||||
~wxApp();
|
||||
|
||||
|
||||
virtual bool Initialize(int& argc, wxChar **argv);
|
||||
|
||||
private:
|
||||
QApplication *m_qtApplication;
|
||||
int m_qtArgc;
|
||||
char **m_qtArgv;
|
||||
|
||||
|
||||
wxDECLARE_DYNAMIC_CLASS_NO_COPY( wxApp );
|
||||
};
|
||||
|
||||
|
||||
#endif // _WX_QT_APP_H_
|
||||
|
@@ -29,7 +29,7 @@ public:
|
||||
wxBitmap(const char* const* bits);
|
||||
wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM);
|
||||
wxBitmap(const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH, double scale = 1.0);
|
||||
|
||||
|
||||
// Convert from wxIcon / wxCursor
|
||||
wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); }
|
||||
explicit wxBitmap(const wxCursor& cursor);
|
||||
|
@@ -35,7 +35,7 @@ public:
|
||||
|
||||
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
|
||||
void SetStyle(int style) { SetStyle((wxBrushStyle)style); }
|
||||
|
||||
|
||||
QBrush GetHandle() const;
|
||||
|
||||
protected:
|
||||
|
@@ -14,7 +14,7 @@ class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase
|
||||
{
|
||||
public:
|
||||
wxChoice();
|
||||
|
||||
|
||||
wxChoice( wxWindow *parent, wxWindowID id,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
@@ -22,7 +22,7 @@ public:
|
||||
long style = 0,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxChoiceNameStr );
|
||||
|
||||
|
||||
wxChoice( wxWindow *parent, wxWindowID id,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
@@ -38,7 +38,7 @@ public:
|
||||
long style = 0,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxChoiceNameStr );
|
||||
|
||||
|
||||
bool Create( wxWindow *parent, wxWindowID id,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
@@ -64,7 +64,7 @@ protected:
|
||||
void **clientData,
|
||||
wxClientDataType type);
|
||||
virtual int DoInsertOneItem(const wxString& item, unsigned int pos);
|
||||
|
||||
|
||||
virtual void DoSetItemClientData(unsigned int n, void *clientData);
|
||||
virtual void *DoGetItemClientData(unsigned int n) const;
|
||||
|
||||
|
@@ -29,7 +29,7 @@ public:
|
||||
|
||||
virtual wxPoint GetHotSpot() const;
|
||||
QCursor &GetHandle() const;
|
||||
|
||||
|
||||
protected:
|
||||
void InitFromStock( wxStockCursor cursorId );
|
||||
#if wxUSE_IMAGE
|
||||
|
@@ -20,7 +20,7 @@ public:
|
||||
wxDataFormat(const wxChar *id);
|
||||
|
||||
void SetId( const wxChar *id );
|
||||
|
||||
|
||||
bool operator==(wxDataFormatId format) const;
|
||||
bool operator!=(wxDataFormatId format) const;
|
||||
bool operator==(const wxDataFormat& format) const;
|
||||
|
@@ -15,7 +15,7 @@ class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase
|
||||
public:
|
||||
wxDataObject();
|
||||
~wxDataObject();
|
||||
|
||||
|
||||
virtual bool IsSupportedFormat(const wxDataFormat& format, Direction dir) const;
|
||||
virtual wxDataFormat GetPreferredFormat(Direction dir = Get) const;
|
||||
virtual size_t GetFormatCount(Direction dir = Get) const;
|
||||
|
@@ -112,7 +112,7 @@ public:
|
||||
|
||||
protected:
|
||||
virtual QPixmap *GetQPixmap() { return m_qtPixmap; }
|
||||
|
||||
|
||||
QPainter *m_qtPainter;
|
||||
QPixmap *m_qtPixmap;
|
||||
|
||||
@@ -132,7 +132,7 @@ private:
|
||||
|
||||
wxDECLARE_CLASS(wxQtDCImpl);
|
||||
wxDECLARE_NO_COPY_CLASS(wxQtDCImpl);
|
||||
|
||||
|
||||
};
|
||||
|
||||
#endif // _WX_QT_DC_H_
|
||||
|
@@ -14,7 +14,7 @@ class WXDLLIMPEXP_CORE wxPrinterDCImpl : public wxDCImpl
|
||||
{
|
||||
public:
|
||||
wxPrinterDCImpl( wxPrinterDC *, const wxPrintData & );
|
||||
|
||||
|
||||
virtual bool CanDrawBitmap() const;
|
||||
virtual bool CanGetTextExtent() const;
|
||||
|
||||
@@ -35,7 +35,7 @@ public:
|
||||
#endif // wxUSE_PALETTE
|
||||
|
||||
virtual void SetLogicalFunction(wxRasterOperationMode function);
|
||||
|
||||
|
||||
virtual wxCoord GetCharHeight() const;
|
||||
virtual wxCoord GetCharWidth() const;
|
||||
virtual void DoGetTextExtent(const wxString& string,
|
||||
@@ -43,7 +43,7 @@ public:
|
||||
wxCoord *descent = NULL,
|
||||
wxCoord *externalLeading = NULL,
|
||||
const wxFont *theFont = NULL) const;
|
||||
|
||||
|
||||
virtual void Clear();
|
||||
|
||||
virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
|
||||
@@ -53,7 +53,7 @@ public:
|
||||
|
||||
virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
|
||||
wxFloodFillStyle style = wxFLOOD_SURFACE);
|
||||
|
||||
|
||||
virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
|
||||
|
||||
virtual void DoDrawPoint(wxCoord x, wxCoord y);
|
||||
|
@@ -12,6 +12,6 @@
|
||||
|
||||
typedef class QWidget *WXWidget;
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif /* _WX_QT_DEFS_H_ */
|
||||
|
@@ -23,7 +23,7 @@ public:
|
||||
const wxString &name = wxDialogNameStr );
|
||||
|
||||
virtual ~wxDialog();
|
||||
|
||||
|
||||
bool Create( wxWindow *parent, wxWindowID id,
|
||||
const wxString &title,
|
||||
const wxPoint &pos = wxDefaultPosition,
|
||||
|
@@ -14,7 +14,7 @@ class WXDLLIMPEXP_CORE wxDropTarget : public wxDropTargetBase
|
||||
{
|
||||
public:
|
||||
wxDropTarget(wxDataObject *dataObject = NULL );
|
||||
|
||||
|
||||
virtual bool OnDrop(wxCoord x, wxCoord y);
|
||||
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
|
||||
virtual bool GetData();
|
||||
@@ -40,7 +40,7 @@ public:
|
||||
const wxIcon © = wxNullIcon,
|
||||
const wxIcon &move = wxNullIcon,
|
||||
const wxIcon &none = wxNullIcon);
|
||||
|
||||
|
||||
virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
|
||||
};
|
||||
#endif // _WX_QT_DND_H_
|
||||
|
@@ -71,11 +71,11 @@ public:
|
||||
virtual void SetUnderlined( bool underlined );
|
||||
virtual void SetStrikethrough(bool strikethrough) wxOVERRIDE;
|
||||
virtual void SetEncoding(wxFontEncoding encoding);
|
||||
|
||||
|
||||
wxDECLARE_COMMON_FONT_METHODS();
|
||||
|
||||
virtual QFont GetHandle() const;
|
||||
|
||||
|
||||
protected:
|
||||
virtual wxGDIRefData *CreateGDIRefData() const;
|
||||
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
|
||||
|
@@ -16,10 +16,10 @@ public:
|
||||
wxFontDialog() { }
|
||||
wxFontDialog(wxWindow *parent) { Create(parent); }
|
||||
wxFontDialog(wxWindow *parent, const wxFontData& data) { Create(parent, data); }
|
||||
|
||||
|
||||
protected:
|
||||
bool DoCreate(wxWindow *parent);
|
||||
|
||||
|
||||
private:
|
||||
|
||||
wxFontData m_data;
|
||||
|
@@ -45,7 +45,7 @@ public:
|
||||
virtual void SetMenuBar(wxMenuBar *menubar);
|
||||
virtual void SetStatusBar(wxStatusBar *statusBar );
|
||||
virtual void SetToolBar(wxToolBar *toolbar);
|
||||
|
||||
|
||||
virtual void SetWindowStyleFlag( long style );
|
||||
|
||||
virtual void AddChild( wxWindowBase *child );
|
||||
|
@@ -51,11 +51,11 @@ public:
|
||||
|
||||
virtual bool IsSelected(int n) const wxOVERRIDE;
|
||||
virtual int GetSelections(wxArrayInt& aSelections) const wxOVERRIDE;
|
||||
|
||||
|
||||
virtual unsigned int GetCount() const;
|
||||
virtual wxString GetString(unsigned int n) const;
|
||||
virtual void SetString(unsigned int n, const wxString& s);
|
||||
|
||||
|
||||
virtual int GetSelection() const;
|
||||
|
||||
virtual QWidget *GetHandle() const;
|
||||
@@ -66,16 +66,16 @@ protected:
|
||||
virtual void DoSetFirstItem(int n) wxOVERRIDE;
|
||||
|
||||
virtual void DoSetSelection(int n, bool select) wxOVERRIDE;
|
||||
|
||||
|
||||
virtual int DoInsertItems(const wxArrayStringsAdapter & items,
|
||||
unsigned int pos,
|
||||
void **clientData,
|
||||
wxClientDataType type);
|
||||
virtual int DoInsertOneItem(const wxString& item, unsigned int pos);
|
||||
|
||||
|
||||
virtual void DoSetItemClientData(unsigned int n, void *clientData);
|
||||
virtual void *DoGetItemClientData(unsigned int n) const;
|
||||
|
||||
|
||||
virtual void DoClear();
|
||||
virtual void DoDeleteOneItem(unsigned int pos);
|
||||
|
||||
|
@@ -75,7 +75,7 @@ class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxMDIClientWindowBase
|
||||
{
|
||||
public:
|
||||
wxMDIClientWindow();
|
||||
|
||||
|
||||
virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);
|
||||
wxDECLARE_DYNAMIC_CLASS(wxMDIClientWindow);
|
||||
};
|
||||
|
@@ -25,7 +25,7 @@ public:
|
||||
const wxString& name = wxFrameNameStr)
|
||||
{
|
||||
return wxFrame::Create(parent, id, title, pos, size,
|
||||
style | wxFRAME_TOOL_WINDOW | wxFRAME_NO_TASKBAR,
|
||||
style | wxFRAME_TOOL_WINDOW | wxFRAME_NO_TASKBAR,
|
||||
name);
|
||||
}
|
||||
|
||||
|
@@ -20,7 +20,7 @@ public:
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = 0,
|
||||
const wxString& name = wxNotebookNameStr);
|
||||
|
||||
|
||||
bool Create(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
|
@@ -13,9 +13,9 @@ class WXDLLIMPEXP_CORE wxPalette : public wxPaletteBase
|
||||
public:
|
||||
wxPalette();
|
||||
wxPalette(int n, unsigned char *red, unsigned char *green, unsigned char *blue);
|
||||
|
||||
|
||||
bool Create(int n, unsigned char *red, unsigned char *green, unsigned char *blue);
|
||||
|
||||
|
||||
bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
|
||||
int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
|
||||
|
||||
|
@@ -43,7 +43,7 @@ public:
|
||||
|
||||
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
|
||||
void SetStyle(int style) { SetStyle((wxPenStyle)style); }
|
||||
|
||||
|
||||
QPen GetHandle() const;
|
||||
|
||||
protected:
|
||||
|
@@ -15,12 +15,12 @@ class WXDLLIMPEXP_CORE wxQtPrintNativeData: public wxPrintNativeDataBase
|
||||
{
|
||||
public:
|
||||
wxQtPrintNativeData();
|
||||
|
||||
|
||||
virtual bool TransferTo( wxPrintData &data );
|
||||
virtual bool TransferFrom( const wxPrintData &data );
|
||||
|
||||
virtual bool IsOk() const;
|
||||
|
||||
|
||||
};
|
||||
|
||||
class WXDLLIMPEXP_CORE wxQtPrintDialog : public wxPrintDialogBase
|
||||
|
@@ -32,7 +32,7 @@ public:
|
||||
wxQtPrintPreview(wxPrintout *printout,
|
||||
wxPrintout *printoutForPrinting,
|
||||
wxPrintData *data);
|
||||
|
||||
|
||||
virtual bool Print(bool interactive);
|
||||
virtual void DetermineScaling();
|
||||
|
||||
|
@@ -29,7 +29,7 @@ public:
|
||||
|
||||
protected:
|
||||
virtual void timerEvent( QTimerEvent * event );
|
||||
|
||||
|
||||
private:
|
||||
int m_timerId;
|
||||
};
|
||||
|
@@ -253,7 +253,7 @@ protected:
|
||||
else
|
||||
event->accept();
|
||||
}
|
||||
|
||||
|
||||
//wxMoveEvent
|
||||
virtual void moveEvent ( QMoveEvent * event )
|
||||
{
|
||||
@@ -265,7 +265,7 @@ protected:
|
||||
else
|
||||
event->accept();
|
||||
}
|
||||
|
||||
|
||||
//wxEraseEvent then wxPaintEvent
|
||||
virtual void paintEvent ( QPaintEvent * event )
|
||||
{
|
||||
@@ -301,7 +301,7 @@ protected:
|
||||
else
|
||||
event->accept();
|
||||
}
|
||||
|
||||
|
||||
//wxMouseEvent
|
||||
virtual void wheelEvent ( QWheelEvent * event )
|
||||
{
|
||||
|
@@ -23,7 +23,7 @@ public:
|
||||
wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
|
||||
wxRegion(const wxBitmap& bmp);
|
||||
wxRegion(const wxBitmap& bmp, const wxColour& transp, int tolerance = 0);
|
||||
|
||||
|
||||
virtual bool IsEmpty() const;
|
||||
virtual void Clear();
|
||||
|
||||
@@ -82,7 +82,7 @@ public:
|
||||
wxCoord GetH() const;
|
||||
wxCoord GetHeight() const;
|
||||
wxRect GetRect() const;
|
||||
|
||||
|
||||
private:
|
||||
QVector < QRect > *m_qtRects;
|
||||
int m_pos;
|
||||
|
@@ -14,7 +14,7 @@ class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase
|
||||
{
|
||||
public:
|
||||
wxStaticBox();
|
||||
|
||||
|
||||
wxStaticBox(wxWindow *parent, wxWindowID id,
|
||||
const wxString& label,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
|
@@ -36,7 +36,7 @@ public:
|
||||
|
||||
QStatusBar *GetQStatusBar() const { return m_qtStatusBar; }
|
||||
QWidget *GetHandle() const;
|
||||
|
||||
|
||||
protected:
|
||||
virtual void DoUpdateStatusText(int number);
|
||||
|
||||
|
@@ -46,7 +46,7 @@ public:
|
||||
virtual bool SetStyle(long start, long end, const wxTextAttr& style);
|
||||
virtual bool GetStyle(long position, wxTextAttr& style);
|
||||
virtual bool SetDefaultStyle(const wxTextAttr& style);
|
||||
|
||||
|
||||
virtual long XYToPosition(long x, long y) const;
|
||||
virtual bool PositionToXY(long pos, long *x, long *y) const;
|
||||
|
||||
|
@@ -20,7 +20,7 @@ public:
|
||||
virtual void Copy();
|
||||
virtual void Cut();
|
||||
virtual void Paste();
|
||||
|
||||
|
||||
virtual void Undo();
|
||||
virtual void Redo();
|
||||
virtual bool CanUndo() const;
|
||||
@@ -32,10 +32,10 @@ public:
|
||||
|
||||
virtual void SetSelection(long from, long to);
|
||||
virtual void GetSelection(long *from, long *to) const;
|
||||
|
||||
|
||||
virtual bool IsEditable() const;
|
||||
virtual void SetEditable(bool editable);
|
||||
|
||||
|
||||
protected:
|
||||
virtual wxString DoGetValue() const;
|
||||
virtual void DoSetValue(const wxString& value, int flags=0);
|
||||
|
@@ -25,7 +25,7 @@ public:
|
||||
static void SetAutoPop(long milliseconds);
|
||||
// set the delay between subsequent tooltips to appear
|
||||
static void SetReshow(long milliseconds);
|
||||
|
||||
|
||||
wxToolTip(const wxString &tip);
|
||||
|
||||
void SetTip(const wxString& tip);
|
||||
|
@@ -28,7 +28,7 @@ public:
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = wxDEFAULT_FRAME_STYLE,
|
||||
const wxString& name = wxFrameNameStr);
|
||||
|
||||
|
||||
virtual bool Show(bool show = true) wxOVERRIDE;
|
||||
virtual void Maximize(bool maximize = true);
|
||||
virtual void Restore();
|
||||
@@ -41,10 +41,10 @@ public:
|
||||
virtual void SetTitle(const wxString& title);
|
||||
virtual wxString GetTitle() const;
|
||||
virtual void SetIcons(const wxIconBundle& icons);
|
||||
|
||||
|
||||
// Styles
|
||||
virtual void SetWindowStyleFlag( long style );
|
||||
virtual long GetWindowStyleFlag() const;
|
||||
};
|
||||
|
||||
|
||||
#endif // _WX_QT_TOPLEVEL_H_
|
||||
|
@@ -29,7 +29,7 @@ public:
|
||||
const wxString& name = wxTreeCtrlNameStr);
|
||||
|
||||
virtual unsigned int GetCount() const;
|
||||
|
||||
|
||||
virtual unsigned int GetIndent() const;
|
||||
virtual void SetIndent(unsigned int indent);
|
||||
|
||||
@@ -55,15 +55,15 @@ public:
|
||||
virtual void SetItemTextColour(const wxTreeItemId& item, const wxColour& col);
|
||||
virtual void SetItemBackgroundColour(const wxTreeItemId& item, const wxColour& col);
|
||||
virtual void SetItemFont(const wxTreeItemId& item, const wxFont& font);
|
||||
|
||||
|
||||
virtual bool IsVisible(const wxTreeItemId& item) const;
|
||||
virtual bool ItemHasChildren(const wxTreeItemId& item) const;
|
||||
virtual bool IsExpanded(const wxTreeItemId& item) const;
|
||||
virtual bool IsSelected(const wxTreeItemId& item) const;
|
||||
virtual bool IsBold(const wxTreeItemId& item) const;
|
||||
|
||||
|
||||
virtual size_t GetChildrenCount(const wxTreeItemId& item, bool recursively = true) const;
|
||||
|
||||
|
||||
virtual wxTreeItemId GetRootItem() const;
|
||||
virtual wxTreeItemId GetSelection() const;
|
||||
virtual size_t GetSelections(wxArrayTreeItemIds& selections) const;
|
||||
@@ -73,7 +73,7 @@ public:
|
||||
virtual wxTreeItemId GetFocusedItem() const;
|
||||
|
||||
virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const;
|
||||
|
||||
|
||||
virtual wxTreeItemId GetFirstChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const;
|
||||
virtual wxTreeItemId GetNextChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const;
|
||||
virtual wxTreeItemId GetLastChild(const wxTreeItemId& item) const;
|
||||
|
Reference in New Issue
Block a user