From 97c73a8ce7e26d36d99b80f7e4dfe30363d004f9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 17 Feb 2012 15:59:12 -0600 Subject: [PATCH] Remove spurious TQ_OBJECT instances --- k9Mplayer/k9mplayer.h | 2 +- k9author/k9avidecode.h | 2 +- k9author/k9avifile.h | 2 +- k9author/k9canvasselection.h | 2 +- k9author/k9chapteredit.h | 2 +- k9author/k9import.h | 2 +- k9author/k9importfiles.h | 2 +- k9author/k9menu.h | 2 +- k9author/k9menubutton.h | 2 +- k9author/k9menuedit.h | 2 +- k9author/k9menueditor.h | 2 +- k9author/k9newdvd.h | 2 +- k9author/k9newtitle.h | 2 +- k9author/k9title.h | 2 +- k9decmpeg/k9plaympeg2.h | 2 +- k9decmpeg/kdecmpeg2.h | 2 +- k9devices/k9cddrive.h | 4 ++-- k9devices/k9dbusdispatch.h | 2 +- k9devices/k9halconnection.h | 2 +- k9devices/k9haldevice.h | 2 +- libk9copy/k9audiocodecs.h | 2 +- libk9copy/k9backupdlg.h | 2 +- libk9copy/k9burndvd.h | 2 +- libk9copy/k9cell.h | 4 ++-- libk9copy/k9drawimage.h | 2 +- libk9copy/k9dvd.h | 2 +- libk9copy/k9dvdauthor.h | 2 +- libk9copy/k9dvdbackup.h | 4 ++-- libk9copy/k9dvdchapter.h | 4 ++-- libk9copy/k9dvdprogress.h | 2 +- libk9copy/k9dvdsize.h | 2 +- libk9copy/k9dvdtitle.h | 8 ++++---- libk9copy/k9dvdtitleset.h | 2 +- libk9copy/k9ifo2.h | 2 +- libk9copy/k9mp4dlg.h | 2 +- libk9copy/k9mp4enc.h | 2 +- libk9copy/k9process.h | 2 +- libk9copy/k9processlist.h | 2 +- libk9copy/k9progress.h | 2 +- libk9copy/k9saveimage.h | 2 +- libk9copy/k9titleencopt.h | 2 +- libk9copy/k9videocodecs.h | 2 +- src/k9copy.h | 2 +- src/k9glwidget.h | 2 +- src/k9langselect.h | 2 +- src/k9main.h | 4 ++-- src/k9mencodercmdgen.h | 2 +- src/k9mp4title.h | 2 +- src/k9playbackoptions.h | 2 +- src/k9prefauthor.h | 2 +- src/k9prefdvd.h | 2 +- src/k9prefmencoder.h | 2 +- src/k9prefmpeg4.h | 2 +- src/k9prefpreview.h | 2 +- src/k9settings.h | 2 +- src/k9titlefactor.h | 2 +- src/k9updatefactor.h | 2 +- src/kviewmpeg2.h | 4 ++-- 58 files changed, 67 insertions(+), 67 deletions(-) diff --git a/k9Mplayer/k9mplayer.h b/k9Mplayer/k9mplayer.h index 62bebec..20775ce 100644 --- a/k9Mplayer/k9mplayer.h +++ b/k9Mplayer/k9mplayer.h @@ -15,7 +15,7 @@ class TQResizeEvent; class K9Mplayer : public MPlayer { Q_OBJECT - TQ_OBJECT + private: KProcess *m_process; bool m_seeking,m_initVol; diff --git a/k9author/k9avidecode.h b/k9author/k9avidecode.h index 06004f7..81cb90c 100644 --- a/k9author/k9avidecode.h +++ b/k9author/k9avidecode.h @@ -57,7 +57,7 @@ typedef void (*avcodec_flush_buffers_t)(AVCodecContext *); class k9AviDecode : public TQObject { Q_OBJECT - TQ_OBJECT + public: k9AviDecode(TQObject *parent = 0, const char *name = 0); diff --git a/k9author/k9avifile.h b/k9author/k9avifile.h index 4a06f1e..afa72cf 100644 --- a/k9author/k9avifile.h +++ b/k9author/k9avifile.h @@ -23,7 +23,7 @@ class k9Title; class k9AviFile : public TQObject { Q_OBJECT - TQ_OBJECT + public: k9AviFile(k9Title *parent = 0, const char *name = 0); diff --git a/k9author/k9canvasselection.h b/k9author/k9canvasselection.h index 35d0179..2ff4648 100644 --- a/k9author/k9canvasselection.h +++ b/k9author/k9canvasselection.h @@ -38,7 +38,7 @@ private: class k9CanvasSelection : public TQObject { Q_OBJECT - TQ_OBJECT + public: k9CanvasSelection(k9MenuEditor *_editor); diff --git a/k9author/k9chapteredit.h b/k9author/k9chapteredit.h index 2af1415..f232de0 100644 --- a/k9author/k9chapteredit.h +++ b/k9author/k9chapteredit.h @@ -22,7 +22,7 @@ class k9DrawImage; class k9ChapterEdit : public chapterEdit { Q_OBJECT - TQ_OBJECT + public: k9ChapterEdit(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); diff --git a/k9author/k9import.h b/k9author/k9import.h index 02a43be..3c87623 100644 --- a/k9author/k9import.h +++ b/k9author/k9import.h @@ -25,7 +25,7 @@ class k9MenuButton; class k9MenuEdit; class k9Import : public import { Q_OBJECT - TQ_OBJECT + private: TQListViewItem *m_root; k9NewDVD m_newDVD; diff --git a/k9author/k9importfiles.h b/k9author/k9importfiles.h index 305b5b3..8b28676 100644 --- a/k9author/k9importfiles.h +++ b/k9author/k9importfiles.h @@ -28,7 +28,7 @@ class k9NewTitle; class k9ImportFiles : public KMdiMainFrm { Q_OBJECT - TQ_OBJECT + public: k9ImportFiles(TQWidget *parent = 0, const char *name = 0); diff --git a/k9author/k9menu.h b/k9author/k9menu.h index d34150e..dc75574 100644 --- a/k9author/k9menu.h +++ b/k9author/k9menu.h @@ -26,7 +26,7 @@ class k9MenuButton; class k9Menu : public TQObject { Q_OBJECT - TQ_OBJECT + public slots: void setStartScript(const TQString &); void setStartScript2(const TQString &); diff --git a/k9author/k9menubutton.h b/k9author/k9menubutton.h index 80d5cf3..20ebcd5 100644 --- a/k9author/k9menubutton.h +++ b/k9author/k9menubutton.h @@ -38,7 +38,7 @@ private: class k9MenuButton : public TQObject { Q_OBJECT - TQ_OBJECT + public: enum eTextPosition {BOTTOM=1,RIGHT=2}; diff --git a/k9author/k9menuedit.h b/k9author/k9menuedit.h index 349a20e..18b7f30 100644 --- a/k9author/k9menuedit.h +++ b/k9author/k9menuedit.h @@ -26,7 +26,7 @@ class k9MenuEditor; class k9MenuEdit : public menuEdit { Q_OBJECT - TQ_OBJECT + public: enum eFormat {PAL=1,NTSC=2}; enum eMenuType {ROOTMENU,TITLEMENU}; diff --git a/k9author/k9menueditor.h b/k9author/k9menueditor.h index dc06f3a..ae22954 100644 --- a/k9author/k9menueditor.h +++ b/k9author/k9menueditor.h @@ -23,7 +23,7 @@ class k9MenuEdit; class k9CanvasSelection; class k9MenuEditor : public TQCanvasView { Q_OBJECT - TQ_OBJECT + public: k9MenuEditor(TQCanvas&, TQWidget* parent=0, const char* name=0, WFlags f=0); diff --git a/k9author/k9newdvd.h b/k9author/k9newdvd.h index cacbe99..e5aac10 100644 --- a/k9author/k9newdvd.h +++ b/k9author/k9newdvd.h @@ -37,7 +37,7 @@ protected: class k9NewDVD : public TQObject { Q_OBJECT - TQ_OBJECT + public: enum eFormat {NTSC=2,PAL=1}; k9NewDVD ( TQObject *parent = 0, const char *name = 0 ); diff --git a/k9author/k9newtitle.h b/k9author/k9newtitle.h index 7b2ed9a..931ae1e 100644 --- a/k9author/k9newtitle.h +++ b/k9author/k9newtitle.h @@ -22,7 +22,7 @@ class k9Import; class k9NewTitle : public newTitle { Q_OBJECT - TQ_OBJECT + private: k9Import *m_k9Import; TQString m_fileName; diff --git a/k9author/k9title.h b/k9author/k9title.h index 109fd67..3a489b0 100644 --- a/k9author/k9title.h +++ b/k9author/k9title.h @@ -30,7 +30,7 @@ protected: class k9Title : public TQObject { Q_OBJECT - TQ_OBJECT + public: k9Title(k9NewDVD *parent = 0, const char *name = 0); ~k9Title(); diff --git a/k9decmpeg/k9plaympeg2.h b/k9decmpeg/k9plaympeg2.h index 28a2f19..bfb0669 100644 --- a/k9decmpeg/k9plaympeg2.h +++ b/k9decmpeg/k9plaympeg2.h @@ -27,7 +27,7 @@ class k9PlayMPEG2 : public TQObject,public TQThread { Q_OBJECT - TQ_OBJECT + private: k9DVDTitle *m_title; TQString m_device; diff --git a/k9decmpeg/kdecmpeg2.h b/k9decmpeg/kdecmpeg2.h index 4476231..a444d5b 100755 --- a/k9decmpeg/kdecmpeg2.h +++ b/k9decmpeg/kdecmpeg2.h @@ -59,7 +59,7 @@ class k9DecodeThread; class kDecMPEG2 : public TQObject { Q_OBJECT - TQ_OBJECT + public: kDecMPEG2(k9DecodeThread *_thread); kDecMPEG2(); diff --git a/k9devices/k9cddrive.h b/k9devices/k9cddrive.h index 9a4a374..0588527 100644 --- a/k9devices/k9cddrive.h +++ b/k9devices/k9cddrive.h @@ -32,7 +32,7 @@ class k9HalConnection; class k9CdDrive : public TQObject { Q_OBJECT - TQ_OBJECT + public: k9CdDrive(); ~k9CdDrive(); @@ -60,7 +60,7 @@ private: class k9CdDrives : public TQObject { Q_OBJECT - TQ_OBJECT + public: k9CdDrives(); ~k9CdDrives(); diff --git a/k9devices/k9dbusdispatch.h b/k9devices/k9dbusdispatch.h index 8e86426..5ee2554 100644 --- a/k9devices/k9dbusdispatch.h +++ b/k9devices/k9dbusdispatch.h @@ -43,7 +43,7 @@ public: class K9DBusDispatch : public TQObject { Q_OBJECT - TQ_OBJECT + public: K9DBusDispatch(TQObject *parent = 0, const char *name = 0); diff --git a/k9devices/k9halconnection.h b/k9devices/k9halconnection.h index 6c532d8..e4936df 100644 --- a/k9devices/k9halconnection.h +++ b/k9devices/k9halconnection.h @@ -39,7 +39,7 @@ namespace DBusTQt { class k9HalConnection : public TQObject { Q_OBJECT - TQ_OBJECT + friend class k9HalDevice; public: static k9HalConnection* getInstance(); diff --git a/k9devices/k9haldevice.h b/k9devices/k9haldevice.h index e77adef..83d5fdc 100644 --- a/k9devices/k9haldevice.h +++ b/k9devices/k9haldevice.h @@ -28,7 +28,7 @@ class k9HalConnection; class k9HalDevice : public TQObject { Q_OBJECT - TQ_OBJECT + public: k9HalDevice(TQObject *parent = 0, const char *name = 0); diff --git a/libk9copy/k9audiocodecs.h b/libk9copy/k9audiocodecs.h index 007bd7c..ec60b5a 100644 --- a/libk9copy/k9audiocodecs.h +++ b/libk9copy/k9audiocodecs.h @@ -24,7 +24,7 @@ class _k9AudioCodec; class k9AudioCodecs : public TQObject { Q_OBJECT - TQ_OBJECT + public: k9AudioCodecs(TQObject *parent = 0, const char *name = 0); diff --git a/libk9copy/k9backupdlg.h b/libk9copy/k9backupdlg.h index 6e92ce5..87787ee 100644 --- a/libk9copy/k9backupdlg.h +++ b/libk9copy/k9backupdlg.h @@ -31,7 +31,7 @@ class k9DrawImage; class k9BackupDlg : public backupDlg { Q_OBJECT - TQ_OBJECT + public: k9BackupDlg(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); diff --git a/libk9copy/k9burndvd.h b/libk9copy/k9burndvd.h index e075bc1..fc2edce 100644 --- a/libk9copy/k9burndvd.h +++ b/libk9copy/k9burndvd.h @@ -32,7 +32,7 @@ class k9BurnDVD: public TQObject { Q_OBJECT - TQ_OBJECT + public: k9BurnDVD(); diff --git a/libk9copy/k9cell.h b/libk9copy/k9cell.h index d62a870..486f14a 100755 --- a/libk9copy/k9cell.h +++ b/libk9copy/k9cell.h @@ -33,7 +33,7 @@ class k9Cell; class k9DVDTitleset; class k9Vobu : public TQObject { Q_OBJECT - TQ_OBJECT + public: k9Vobu(k9Cell * parent,uint32_t _oldSector); ~k9Vobu(); @@ -63,7 +63,7 @@ protected: class k9Cell : public TQObject { Q_OBJECT - TQ_OBJECT + public: k9Cell(TQObject *parent = 0, const char *name = 0); ~k9Cell(); diff --git a/libk9copy/k9drawimage.h b/libk9copy/k9drawimage.h index dc51c67..368c128 100644 --- a/libk9copy/k9drawimage.h +++ b/libk9copy/k9drawimage.h @@ -21,7 +21,7 @@ class k9DrawImage : public TQWidget { Q_OBJECT - TQ_OBJECT + public: k9DrawImage(TQWidget *parent = 0, const char *name = 0); void setImage(TQString _fileName); diff --git a/libk9copy/k9dvd.h b/libk9copy/k9dvd.h index e8c7d2e..5371eeb 100755 --- a/libk9copy/k9dvd.h +++ b/libk9copy/k9dvd.h @@ -50,7 +50,7 @@ class k9DVDTitleset; class k9DVD : public TQObject { Q_OBJECT -TQ_OBJECT + private: TQObjectList m_titles; TQPtrList m_titlesets; diff --git a/libk9copy/k9dvdauthor.h b/libk9copy/k9dvdauthor.h index 60fdd26..ef13dbe 100755 --- a/libk9copy/k9dvdauthor.h +++ b/libk9copy/k9dvdauthor.h @@ -36,7 +36,7 @@ class k9DVDAuthor : public TQObject { Q_OBJECT - TQ_OBJECT + public: k9DVDAuthor(TQObject *DVDStruct,const char* name=0,const TQStringList& args=0) ; ~k9DVDAuthor(); diff --git a/libk9copy/k9dvdbackup.h b/libk9copy/k9dvdbackup.h index 1b56e17..71d9595 100755 --- a/libk9copy/k9dvdbackup.h +++ b/libk9copy/k9dvdbackup.h @@ -36,7 +36,7 @@ class k9Ifo2; class k9TitleSet : public TQObject { Q_OBJECT - TQ_OBJECT + public: k9TitleSet(int _VTS); ~k9TitleSet(); @@ -65,7 +65,7 @@ class k9vamps; class k9DVDBackup : public TQObject { Q_OBJECT - TQ_OBJECT + public: k9DVDBackup(TQObject *_dvd,const char* name=0,const TQStringList& args=0) ; diff --git a/libk9copy/k9dvdchapter.h b/libk9copy/k9dvdchapter.h index 9b8affc..cf0671a 100644 --- a/libk9copy/k9dvdchapter.h +++ b/libk9copy/k9dvdchapter.h @@ -25,7 +25,7 @@ class k9DVDTitle; class k9ChapterCell :public TQObject { Q_OBJECT - TQ_OBJECT + public: k9ChapterCell(uint _id,uint _angle){ m_id=_id;m_angle=_angle;m_angleBlock=angleNone;}; virtual uint getid() {return m_id;}; @@ -47,7 +47,7 @@ private: class k9DVDChapter : public TQObject { Q_OBJECT - TQ_OBJECT + friend class k9DVDTitle; friend class k9DVD; private: // Private attributes diff --git a/libk9copy/k9dvdprogress.h b/libk9copy/k9dvdprogress.h index 98ab463..8744277 100755 --- a/libk9copy/k9dvdprogress.h +++ b/libk9copy/k9dvdprogress.h @@ -29,7 +29,7 @@ class k9DVDProgress : public DVDProgress { Q_OBJECT - TQ_OBJECT + public: k9DVDProgress(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~k9DVDProgress(); diff --git a/libk9copy/k9dvdsize.h b/libk9copy/k9dvdsize.h index ab6c73c..bc43253 100644 --- a/libk9copy/k9dvdsize.h +++ b/libk9copy/k9dvdsize.h @@ -19,7 +19,7 @@ */ class k9DVDSize:public TQObject { Q_OBJECT - TQ_OBJECT + private: static int m_size; public: diff --git a/libk9copy/k9dvdtitle.h b/libk9copy/k9dvdtitle.h index 4e74ddc..8e9f13c 100644 --- a/libk9copy/k9dvdtitle.h +++ b/libk9copy/k9dvdtitle.h @@ -31,7 +31,7 @@ class k9DVDTitleSet; class k9DVDVideoStream : public TQObject{ Q_OBJECT -TQ_OBJECT + friend class k9DVDTitle; private: // Private attributes public: // Public methods @@ -40,7 +40,7 @@ public: // Public methods class k9DVDAudioStream : public TQObject{ Q_OBJECT -TQ_OBJECT + friend class k9DVDTitle; friend class k9DVD; private: // Private attributes @@ -101,7 +101,7 @@ public: // Public methods class k9DVDSubtitle : public TQObject{ Q_OBJECT -TQ_OBJECT + friend class k9DVDTitle; friend class k9DVD; private: // Private attributes @@ -145,7 +145,7 @@ class k9TitleEncOpt; class k9DVDTitle : public TQObject{ Q_OBJECT -TQ_OBJECT + friend class k9DVD; private: // Public attributes unsigned int ts_nr; diff --git a/libk9copy/k9dvdtitleset.h b/libk9copy/k9dvdtitleset.h index 1e32902..20c41c9 100644 --- a/libk9copy/k9dvdtitleset.h +++ b/libk9copy/k9dvdtitleset.h @@ -22,7 +22,7 @@ class k9DVDTitleset :public TQObject { Q_OBJECT - TQ_OBJECT + private: int m_num; uint32_t m_size; diff --git a/libk9copy/k9ifo2.h b/libk9copy/k9ifo2.h index 2fbcf20..e093120 100644 --- a/libk9copy/k9ifo2.h +++ b/libk9copy/k9ifo2.h @@ -28,7 +28,7 @@ */ class k9Ifo2 : public TQObject { Q_OBJECT - TQ_OBJECT + public: k9Ifo2(k9DVDRead *_dvdread); diff --git a/libk9copy/k9mp4dlg.h b/libk9copy/k9mp4dlg.h index 1de9c2f..51cf3c0 100644 --- a/libk9copy/k9mp4dlg.h +++ b/libk9copy/k9mp4dlg.h @@ -21,7 +21,7 @@ class k9DrawImage; class k9MP4Dlg : public MP4Dlg { Q_OBJECT - TQ_OBJECT + public: k9MP4Dlg(TQWidget* parent = 0, const char* name = 0); diff --git a/libk9copy/k9mp4enc.h b/libk9copy/k9mp4enc.h index e75446e..92396ce 100644 --- a/libk9copy/k9mp4enc.h +++ b/libk9copy/k9mp4enc.h @@ -24,7 +24,7 @@ class k9MP4Dlg; */ class k9MP4Enc : public TQObject { Q_OBJECT - TQ_OBJECT + private: k9Process *m_process; k9MP4Dlg *m_progress; diff --git a/libk9copy/k9process.h b/libk9copy/k9process.h index 47f577e..f39efa0 100644 --- a/libk9copy/k9process.h +++ b/libk9copy/k9process.h @@ -20,7 +20,7 @@ class k9Process : public KProcess { Q_OBJECT - TQ_OBJECT + public: k9Process(TQObject *parent = 0, const char *name = 0); void sync(); diff --git a/libk9copy/k9processlist.h b/libk9copy/k9processlist.h index 5ee0c31..44d2a8c 100644 --- a/libk9copy/k9processlist.h +++ b/libk9copy/k9processlist.h @@ -19,7 +19,7 @@ #include class k9ProcessList : public processList { Q_OBJECT - TQ_OBJECT + public: k9ProcessList(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); diff --git a/libk9copy/k9progress.h b/libk9copy/k9progress.h index a39a298..d9c4fd0 100644 --- a/libk9copy/k9progress.h +++ b/libk9copy/k9progress.h @@ -22,7 +22,7 @@ class k9Progress : public Progress { Q_OBJECT - TQ_OBJECT + public: k9Progress(TQWidget* parent = 0, const char* name = 0, const TQStringList &args=0); diff --git a/libk9copy/k9saveimage.h b/libk9copy/k9saveimage.h index e37aa1d..ffe503d 100644 --- a/libk9copy/k9saveimage.h +++ b/libk9copy/k9saveimage.h @@ -32,7 +32,7 @@ class kDecMPEG2; class k9SaveImage : public TQObject,TQThread { Q_OBJECT - TQ_OBJECT + public: k9SaveImage(); ~k9SaveImage(); diff --git a/libk9copy/k9titleencopt.h b/libk9copy/k9titleencopt.h index 71e4aa5..339aba0 100644 --- a/libk9copy/k9titleencopt.h +++ b/libk9copy/k9titleencopt.h @@ -24,7 +24,7 @@ class k9DVDTitle; class k9TitleEncOpt : public TQObject { Q_OBJECT - TQ_OBJECT + public: k9TitleEncOpt(k9DVDTitle *parent ); ~k9TitleEncOpt(); diff --git a/libk9copy/k9videocodecs.h b/libk9copy/k9videocodecs.h index 163f3b9..75a0faf 100644 --- a/libk9copy/k9videocodecs.h +++ b/libk9copy/k9videocodecs.h @@ -25,7 +25,7 @@ class _k9VideoCodec; class k9VideoCodecs : public TQObject { Q_OBJECT - TQ_OBJECT + public: k9VideoCodecs(TQObject *parent = 0, const char *name = 0); diff --git a/src/k9copy.h b/src/k9copy.h index 6406a62..c72bdda 100644 --- a/src/k9copy.h +++ b/src/k9copy.h @@ -37,7 +37,7 @@ class k9NewTitle; class k9ChapterEdit; class k9Copy : public KMdiMainFrm { Q_OBJECT - TQ_OBJECT + public: /** * Default Constructor diff --git a/src/k9glwidget.h b/src/k9glwidget.h index f7be0e0..91bac85 100644 --- a/src/k9glwidget.h +++ b/src/k9glwidget.h @@ -46,7 +46,7 @@ typedef const GLubyte * (*glGetString_t)( GLenum ); class k9GLWidget : public TQGLWidget { Q_OBJECT - TQ_OBJECT + public: void setImage(uchar *_buffer,int _width,int _height,int _len); static k9GLWidget * createWidget(TQWidget *parent = 0, const char *name = 0); diff --git a/src/k9langselect.h b/src/k9langselect.h index 6ed0d11..3fbbd1f 100644 --- a/src/k9langselect.h +++ b/src/k9langselect.h @@ -41,7 +41,7 @@ protected: class k9LangSelect : public langSelect { Q_OBJECT - TQ_OBJECT + public: k9LangSelect(k9Main *mainWindow,TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); diff --git a/src/k9main.h b/src/k9main.h index 1c2f3da..0a75343 100644 --- a/src/k9main.h +++ b/src/k9main.h @@ -100,7 +100,7 @@ protected: class k9DVDListItem : public TQObject { Q_OBJECT - TQ_OBJECT + public: k9DVDAudioStream *audioStream; k9DVDSubtitle *subtitle; @@ -114,7 +114,7 @@ public: class k9Main : public MainDlg { Q_OBJECT - TQ_OBJECT + public: diff --git a/src/k9mencodercmdgen.h b/src/k9mencodercmdgen.h index 37ae9cd..ad14816 100644 --- a/src/k9mencodercmdgen.h +++ b/src/k9mencodercmdgen.h @@ -25,7 +25,7 @@ class _k9CheckListItem; class k9MencoderCmdGen : public MyDialog1 { Q_OBJECT - TQ_OBJECT + public: k9MencoderCmdGen(TQWidget* parent, const TQString &_cmd, bool modal = FALSE, WFlags fl = 0 ); diff --git a/src/k9mp4title.h b/src/k9mp4title.h index b54d793..2279352 100644 --- a/src/k9mp4title.h +++ b/src/k9mp4title.h @@ -22,7 +22,7 @@ class k9DVD; class k9MP4Title : public prefMPEG4 { Q_OBJECT - TQ_OBJECT + public: k9MP4Title(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); diff --git a/src/k9playbackoptions.h b/src/k9playbackoptions.h index b356797..d7978e0 100644 --- a/src/k9playbackoptions.h +++ b/src/k9playbackoptions.h @@ -41,7 +41,7 @@ class k9Main; class k9PlaybackOptions : public PlaybackOptionsw { Q_OBJECT - TQ_OBJECT + public: k9PlaybackOptions(k9Main *mainWindow,TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); diff --git a/src/k9prefauthor.h b/src/k9prefauthor.h index b59747d..7e09c66 100644 --- a/src/k9prefauthor.h +++ b/src/k9prefauthor.h @@ -19,7 +19,7 @@ class k9prefAuthor : public prefAuthor { Q_OBJECT - TQ_OBJECT + public: k9prefAuthor(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); diff --git a/src/k9prefdvd.h b/src/k9prefdvd.h index 42b9f6d..274cf68 100644 --- a/src/k9prefdvd.h +++ b/src/k9prefdvd.h @@ -18,7 +18,7 @@ class k9prefDVD : public prefDVD { Q_OBJECT - TQ_OBJECT + public: k9prefDVD(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); diff --git a/src/k9prefmencoder.h b/src/k9prefmencoder.h index 0e3456f..5d77464 100644 --- a/src/k9prefmencoder.h +++ b/src/k9prefmencoder.h @@ -24,7 +24,7 @@ class k9prefMencoder : public prefMencoder { Q_OBJECT - TQ_OBJECT + public: k9prefMencoder(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); diff --git a/src/k9prefmpeg4.h b/src/k9prefmpeg4.h index 99a58c4..7920df0 100644 --- a/src/k9prefmpeg4.h +++ b/src/k9prefmpeg4.h @@ -18,7 +18,7 @@ class k9prefMPEG4 : public prefMPEG4 { Q_OBJECT - TQ_OBJECT + public: k9prefMPEG4(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); diff --git a/src/k9prefpreview.h b/src/k9prefpreview.h index 4027fd9..e2e3348 100644 --- a/src/k9prefpreview.h +++ b/src/k9prefpreview.h @@ -19,7 +19,7 @@ class k9prefPreview : public prefPreview { Q_OBJECT - TQ_OBJECT + public: k9prefPreview(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); diff --git a/src/k9settings.h b/src/k9settings.h index f43939d..60ffb45 100644 --- a/src/k9settings.h +++ b/src/k9settings.h @@ -26,7 +26,7 @@ */ class k9settings:public KDialogBase{ Q_OBJECT - TQ_OBJECT + public: k9settings(TQWidget *parent,const TQString &caption); diff --git a/src/k9titlefactor.h b/src/k9titlefactor.h index 29466ab..5f6712a 100644 --- a/src/k9titlefactor.h +++ b/src/k9titlefactor.h @@ -22,7 +22,7 @@ class k9TitleFactor : public titleFactor { Q_OBJECT - TQ_OBJECT + public: k9TitleFactor(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); diff --git a/src/k9updatefactor.h b/src/k9updatefactor.h index 28df90d..3220dfa 100644 --- a/src/k9updatefactor.h +++ b/src/k9updatefactor.h @@ -24,7 +24,7 @@ class k9Main; class k9UpdateFactor : public TQObject, public TQThread { Q_OBJECT - TQ_OBJECT + private: TQMutex m_mutex; bool m_restart; diff --git a/src/kviewmpeg2.h b/src/kviewmpeg2.h index 1c0b58b..1330a0d 100755 --- a/src/kviewmpeg2.h +++ b/src/kviewmpeg2.h @@ -40,7 +40,7 @@ class k9Widget : public TQWidget { Q_OBJECT - TQ_OBJECT + protected: TQImage *m_image; void paintEvent ( TQPaintEvent * _event); @@ -52,7 +52,7 @@ public: class kViewMPEG2 : public ViewMPEG2 { Q_OBJECT - TQ_OBJECT + public: kViewMPEG2(); ~kViewMPEG2();