Skip to content

Commit

Permalink
Remove Qt keywords(signals, slots) to make compatible with QT_NO_KEYW…
Browse files Browse the repository at this point in the history
…ORDS

Exclude *.pyc, *.swp and build/ directory. The former makes editing
easier for vim users, and the latter is for convenience
  • Loading branch information
Horosphere committed Jul 17, 2016
1 parent ae9677e commit 2043603
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 12 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ Makefile*
.obj
/bin*
/lib*
build
Debug
Release
*.Debug
Expand All @@ -65,3 +66,6 @@ Release
*.moc
*qrc_res.cpp

#cache
*.pyc
*.swp
4 changes: 2 additions & 2 deletions src/QtAV/AVClock.h
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,13 @@ class Q_AV_EXPORT AVClock : public QObject
*/
bool syncEndOnce(int id);

signals:
Q_SIGNALS:
void paused(bool);
void paused(); //equals to paused(true)
void resumed();//equals to paused(false)
void started();
void resetted();
public slots:
public Q_SLOTS:
//these slots are not frequently used. so not inline
/*start the external clock*/
void start();
Expand Down
2 changes: 1 addition & 1 deletion src/QtAV/AVDemuxer.h
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ class Q_AV_EXPORT AVDemuxer : public QObject
*/
void setOptions(const QVariantHash &dict);
QVariantHash options() const;
signals:
Q_SIGNALS:
void unloaded();
void userInterrupted(); //NO direct connection because it's emit before interrupted happens
void loaded();
Expand Down
2 changes: 1 addition & 1 deletion src/QtAV/AVPlayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ class Q_AV_EXPORT AVPlayer : public QObject
MediaEndAction mediaEndAction() const;
void setMediaEndAction(MediaEndAction value);

public slots:
public Q_SLOTS:
/*!
* \brief load
* Load the current media set by setFile(); Can be used to reload a media and call play() later. If already loaded, does nothing and return true.
Expand Down
2 changes: 1 addition & 1 deletion src/QtAV/Filter.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class Q_AV_EXPORT Filter : public QObject
bool uninstall();
public Q_SLOTS:
void setEnabled(bool enabled = true);
signals:
Q_SIGNALS:
void enabledChanged(bool);
protected:
/*
Expand Down
2 changes: 1 addition & 1 deletion src/QtAV/OpenGLVideo.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class Q_AV_EXPORT OpenGLVideo : public QObject
protected:
DPTR_DECLARE(OpenGLVideo)

private slots:
private Q_SLOTS:
/* used by Qt5 whose QOpenGLContext is QObject and we can call this when context is about to destroy.
* shader manager and material will be reset
*/
Expand Down
4 changes: 2 additions & 2 deletions src/QtAV/Subtitle.h
Original file line number Diff line number Diff line change
Expand Up @@ -179,15 +179,15 @@ class Q_AV_EXPORT Subtitle : public QObject
void setFontsDir(const QString& value);
bool isFontFileForced() const;
void setFontFileForced(bool value);
public slots:
public Q_SLOTS:
/*!
* \brief start
* start to process the whole subtitle content in a thread
*/
void load();
void loadAsync();
void setTimestamp(qreal t);
signals:
Q_SIGNALS:
// TODO: also add to AVPlayer?
/// empty path if load from raw data
void loaded(const QString& path = QString());
Expand Down
6 changes: 3 additions & 3 deletions src/QtAV/SubtitleFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ class Q_AV_EXPORT SubtitleFilter : public VideoFilter, public SubtitleAPIProxy
QFont font() const;
void setColor(const QColor& c);
QColor color() const;
public slots:
public Q_SLOTS:
// TODO: enable changed & autoload=> load
void setAutoLoad(bool value);
signals:
Q_SIGNALS:
void rectChanged();
void fontChanged();
void colorChanged();
void autoLoadChanged(bool value);
signals:
Q_SIGNALS:
void fileChanged();
void canRenderChanged();
void loaded(const QString& path);
Expand Down
2 changes: 1 addition & 1 deletion src/QtAV/VideoCapture.h
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public Q_SLOTS:
void qualityChanged();
void captureNameChanged();
void captureDirChanged();
private slots:
private Q_SLOTS:
void handleAppQuit();
private:
void setVideoFrame(const VideoFrame& frame);
Expand Down

0 comments on commit 2043603

Please sign in to comment.