Reformat arts files

This commit does not change compiled functionality
pull/16/head
Timothy Pearson 12 years ago
parent c5463fddb1
commit c6e643528e

File diff suppressed because it is too large Load Diff

@ -30,80 +30,67 @@ class TDEConfig;
class KNotify : public TQObject, public DCOPObject class KNotify : public TQObject, public DCOPObject
{ {
Q_OBJECT Q_OBJECT
K_DCOP K_DCOP
public: public:
KNotify( bool useArts ); KNotify( bool useArts );
~KNotify(); ~KNotify();
enum PlayingFinishedStatus enum PlayingFinishedStatus {
{ PlayedOK = 0, // success, all following mean failure
PlayedOK = 0, // success, all following mean failure NoSoundFile,
NoSoundFile, FileAlreadyPlaying,
FileAlreadyPlaying, NoSoundSupport,
NoSoundSupport, PlayerBusy,
PlayerBusy, Aborted,
Aborted, Unknown = 5000
Unknown = 5000 };
};
protected:
protected: k_dcop:
k_dcop: // deprecated
// deprecated void notify(const TQString &event, const TQString &fromApp, const TQString &text, TQString sound, TQString file, int present, int level);
void notify(const TQString &event, const TQString &fromApp,
const TQString &text, TQString sound, TQString file, // deprecated
int present, int level); void notify(const TQString &event, const TQString &fromApp, const TQString &text, TQString sound, TQString file, int present, int level, int winId);
// deprecated void notify(const TQString &event, const TQString &fromApp, const TQString &text, TQString sound, TQString file, int present, int level, int winId, int eventId);
void notify(const TQString &event, const TQString &fromApp,
const TQString &text, TQString sound, TQString file,
int present, int level, int winId); void reconfigure();
void setVolume( int volume );
void notify(const TQString &event, const TQString &fromApp, void sessionReady(); // from ksmserver
const TQString &text, TQString sound, TQString file,
int present, int level, int winId, int eventId); private:
bool notifyBySound(const TQString &sound, const TQString &appname, int eventId);
bool notifyByMessagebox(const TQString &text, int level, WId winId);
void reconfigure(); bool notifyByLogfile(const TQString &text, const TQString &file);
void setVolume( int volume ); bool notifyByStderr(const TQString &text);
void sessionReady(); // from ksmserver bool notifyByPassivePopup(const TQString &text, const TQString &appName, TDEConfig* eventsFile, WId winId );
bool notifyByExecute(const TQString &command, const TQString& event, const TQString& fromApp, const TQString& text, int winId, int eventId );
private: bool notifyByTaskbar( WId winId );
bool notifyBySound(const TQString &sound, const TQString &appname, int eventId);
bool notifyByMessagebox(const TQString &text, int level, WId winId); bool isPlaying( const TQString& soundFile ) const;
bool notifyByLogfile(const TQString &text, const TQString &file);
bool notifyByStderr(const TQString &text); void soundFinished( int eventId, PlayingFinishedStatus reason );
bool notifyByPassivePopup(const TQString &text, const TQString &appName, void abortFirstPlayObject();
TDEConfig* eventsFile, WId winId );
bool notifyByExecute(const TQString &command, WId checkWinId( const TQString& appName, WId senderWinId );
const TQString& event,
const TQString& fromApp, /**
const TQString& text, * checks if eventname is a global event (exists in config/eventsrc)
int winId, **/
int eventId ); bool isGlobal(const TQString &eventname);
bool notifyByTaskbar( WId winId );
private slots:
bool isPlaying( const TQString& soundFile ) const; void playTimeout();
void slotPlayerProcessExited( TDEProcess *proc );
void soundFinished( int eventId, PlayingFinishedStatus reason ); void restartedArtsd();
void abortFirstPlayObject();
private:
WId checkWinId( const TQString& appName, WId senderWinId ); KNotifyPrivate* d;
void loadConfig();
/**
* checks if eventname is a global event (exists in config/eventsrc)
**/
bool isGlobal(const TQString &eventname);
private slots:
void playTimeout();
void slotPlayerProcessExited( TDEProcess *proc );
void restartedArtsd();
private:
KNotifyPrivate* d;
void loadConfig();
}; };

Loading…
Cancel
Save