← Back to branch summary

~ubuntu-branches/ubuntu/trusty/scribus/trusty

« back to all changes in this revision

Viewing changes to scribus/scraction.h

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2013-05-16 20:34:07 UTC
  • mfrom: (1.1.13) (32.1.2 saucy-proposed)
  • Revision ID: package-import@ubuntu.com-20130516203407-ztj7ebsivoo41dih
Tags: 1.4.2.dfsg+r18267-1ubuntu2
Avoid qreal/double type clashes on ARM.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scribus/scraction.h
35
35
        Q_OBJECT
36
36
 
37
37
public:
38
 
        typedef enum {Normal, DataInt, DataDouble, DataQString, RecentFile, DLL, Window, RecentScript, UnicodeChar, Layer, ActionDLL, RecentPaste } ActionType;
 
38
        typedef enum {Normal, DataInt, DataDouble, DataQString, RecentFile, DLL, Window, RecentScript, UnicodeChar, Layer, ActionDLL, RecentPaste, ActionDLLSE } ActionType;
39
39
        
40
40
        /*!
41
41
                \author Craig Bradney
113
113
        */
114
114
        QString cleanMenuText();
115
115
 
 
116
        void setToolTipFromTextAndShortcut();
 
117
 
116
118
        /*!
117
119
                \author Craig Bradney
118
120
                \date Jan 2005
177
179
        void triggeredData(double);
178
180
        void triggeredData(QString);
179
181
        void triggeredData(ScribusDoc*);
 
182
        void triggeredData(QWidget*, ScribusDoc*);
180
183
        void toggledData(bool, int);
181
184
        void toggledData(bool, double);
182
185
        void toggledData(bool, QString);