diff options
Diffstat (limited to 'src/projects')
118 files changed, 2847 insertions, 2789 deletions
diff --git a/src/projects/base_k3badvanceddataimagesettings.ui b/src/projects/base_k3badvanceddataimagesettings.ui index 593b404..c236ab8 100644 --- a/src/projects/base_k3badvanceddataimagesettings.ui +++ b/src/projects/base_k3badvanceddataimagesettings.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bAdvancedDataImageSettings</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>base_K3bDataCustomFilesystemsWidget</cstring> </property> @@ -18,7 +18,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupIsoSettings</cstring> </property> @@ -50,7 +50,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -61,7 +61,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkRockRidge</cstring> </property> @@ -81,7 +81,7 @@ <p><b>It is highly recommended to use Rock Ridge extensions on every data CD or DVD.</b></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkJoliet</cstring> </property> @@ -99,7 +99,7 @@ <p><b>Caution:</b> With the exception of Linux and FreeBSD, there is no POSIX-like OS that supports Joliet. So <b>never create Joliet-only CDs or DVDs</b> for that reason.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkUdf</cstring> </property> @@ -116,7 +116,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="0" column="1"> + <widget class="TQGroupBox" row="0" column="1"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -127,15 +127,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkForceInputCharset</cstring> </property> @@ -156,7 +156,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkPreservePermissions</cstring> </property> @@ -184,7 +184,7 @@ <tabstop>m_checkRockRidge</tabstop> <tabstop>m_checkJoliet</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/src/projects/base_k3baudiocdtextallfieldswidget.ui b/src/projects/base_k3baudiocdtextallfieldswidget.ui index e178d1f..c8d647d 100644 --- a/src/projects/base_k3baudiocdtextallfieldswidget.ui +++ b/src/projects/base_k3baudiocdtextallfieldswidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bAudioCdTextAllFieldsWidget</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>base_K3bAudioCdTextAllFieldsWidget</cstring> </property> @@ -12,7 +12,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel" row="8" column="0"> + <widget class="TQLabel" row="8" column="0"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -23,9 +23,9 @@ <cstring>m_editMessage</cstring> </property> </widget> - <widget class="QLayoutWidget" row="4" column="1"> + <widget class="TQLayoutWidget" row="4" column="1"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -36,7 +36,7 @@ <cstring>m_editSongwriter</cstring> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_buttonCopySongwriter</cstring> </property> @@ -49,7 +49,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -60,9 +60,9 @@ <cstring>m_editUpc_ean</cstring> </property> </widget> - <widget class="QLayoutWidget" row="5" column="1"> + <widget class="TQLayoutWidget" row="5" column="1"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -73,7 +73,7 @@ <cstring>m_editComposer</cstring> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_buttonCopyComposer</cstring> </property> @@ -86,7 +86,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -97,7 +97,7 @@ <cstring>m_editSongwriter</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -108,7 +108,7 @@ <cstring>m_editComposer</cstring> </property> </widget> - <widget class="QLabel" row="7" column="0"> + <widget class="TQLabel" row="7" column="0"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -119,9 +119,9 @@ <cstring>m_editDisc_id</cstring> </property> </widget> - <widget class="QLayoutWidget" row="3" column="1"> + <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -132,7 +132,7 @@ <cstring>m_editArranger</cstring> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_buttonCopyArranger</cstring> </property> @@ -145,7 +145,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -171,7 +171,7 @@ <cstring>m_editMessage</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -182,9 +182,9 @@ <cstring>m_editPerformer</cstring> </property> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -195,7 +195,7 @@ <cstring>m_editTitle</cstring> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_buttonCopyTitle</cstring> </property> @@ -208,7 +208,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -233,9 +233,9 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -246,7 +246,7 @@ <cstring>m_editPerformer</cstring> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_buttonCopyPerformer</cstring> </property> @@ -261,7 +261,7 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/src/projects/base_k3baudiocdtextwidget.ui b/src/projects/base_k3baudiocdtextwidget.ui index 50daff2..7478a3e 100644 --- a/src/projects/base_k3baudiocdtextwidget.ui +++ b/src/projects/base_k3baudiocdtextwidget.ui @@ -2,7 +2,7 @@ <class>base_K3bAudioCdTextWidget</class> <comment>Widget to edit the global CD-Text in a K3b audio project.</comment> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>K3bAudioCDTextWidget</cstring> </property> @@ -13,7 +13,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_groupCdText</cstring> </property> @@ -40,7 +40,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame3</cstring> </property> @@ -57,7 +57,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -68,9 +68,9 @@ <cstring>m_editPerformer</cstring> </property> </widget> - <widget class="QLayoutWidget" row="2" column="1"> + <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -81,7 +81,7 @@ <cstring>m_editPerformer</cstring> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_buttonCopyPerformer</cstring> </property> @@ -94,9 +94,9 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -107,7 +107,7 @@ <cstring>m_editTitle</cstring> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_buttonCopyTitle</cstring> </property> @@ -120,7 +120,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -133,9 +133,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <hbox> <property name="name"> @@ -151,14 +151,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>0</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonMoreFields</cstring> </property> @@ -178,7 +178,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>0</height> @@ -207,14 +207,14 @@ <tabstop>m_editTitle</tabstop> <tabstop>m_editPerformer</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot access="protected" specifier="pure virtual">slotCopyTitle()</slot> <slot access="protected" specifier="pure virtual">slotCopyPerformer()</slot> <slot access="protected" specifier="pure virtual">slotCopyArranger()</slot> <slot access="protected" specifier="pure virtual">slotCopyComposer()</slot> <slot access="protected" specifier="pure virtual">slotCopySongwriter()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/src/projects/base_k3baudiotrackwidget.ui b/src/projects/base_k3baudiotrackwidget.ui index 813b042..4641369 100644 --- a/src/projects/base_k3baudiotrackwidget.ui +++ b/src/projects/base_k3baudiotrackwidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bAudioTrackWidget</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>K3bAudioTrackWidget</cstring> </property> @@ -15,11 +15,11 @@ <property name="margin"> <number>0</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>m_mainTab</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -30,9 +30,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <grid> <property name="name"> @@ -43,7 +43,7 @@ <cstring>m_editSongwriter</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -83,7 +83,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="2" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -94,7 +94,7 @@ <cstring>m_editArranger</cstring> </property> </widget> - <widget class="QLabel" row="2" column="2" rowspan="2" colspan="1"> + <widget class="TQLabel" row="2" column="2" rowspan="2" colspan="1"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -105,7 +105,7 @@ <cstring>m_editComposer</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -121,7 +121,7 @@ <cstring>m_editTitle</cstring> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -132,7 +132,7 @@ <cstring>m_editPerformer</cstring> </property> </widget> - <widget class="QLabel" row="4" column="2"> + <widget class="TQLabel" row="4" column="2"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -143,7 +143,7 @@ <cstring>m_editIsrc</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>350</width> <height>50</height> @@ -185,7 +185,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -196,7 +196,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkPreemphasis</cstring> </property> @@ -204,10 +204,10 @@ <string>Preemph&asis</string> </property> <property name="whatsThis" stdset="0"> - <string><p>Preemphasis is mainly used in audio processing. Higher frequencies in audio signals usually have lower amplitudes. This can lead to bad signal quality on noisy transmission because the high frequencies might become too weak. To avoid this effect, high frequencies are amplified before transmission (preemphasis); the receiver will then weaken them accordingly for playback.</string> + <string><p>Preemphasis is mainly used in audio processing. Higher frequencies in audio Q_SIGNALS usually have lower amplitudes. This can lead to bad signal quality on noisy transmission because the high frequencies might become too weak. To avoid this effect, high frequencies are amplified before transmission (preemphasis); the receiver will then weaken them accordingly for playback.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkCopyPermitted</cstring> </property> @@ -215,15 +215,15 @@ <string>&Copy permitted</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_labelPostGap</cstring> </property> @@ -257,7 +257,7 @@ This does not mean that K3b adds an additional gap of silence to the track. This <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>161</width> <height>20</height> @@ -276,7 +276,7 @@ This does not mean that K3b adds an additional gap of silence to the track. This <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>80</height> @@ -322,7 +322,7 @@ This does not mean that K3b adds an additional gap of silence to the track. This <tabstop>m_checkPreemphasis</tabstop> <tabstop>m_checkCopyPermitted</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/src/projects/base_k3bbootimageview.ui b/src/projects/base_k3bbootimageview.ui index 6ba21f6..f7fab2e 100644 --- a/src/projects/base_k3bbootimageview.ui +++ b/src/projects/base_k3bbootimageview.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bBootImageView</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>base_K3bBootImageView</cstring> </property> @@ -12,15 +12,15 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>label</cstring> </property> @@ -36,7 +36,7 @@ <string>Boot images:</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonNew</cstring> </property> @@ -47,7 +47,7 @@ <string>Add new boot image</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonDelete</cstring> </property> @@ -104,7 +104,7 @@ <bool>true</bool> </property> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>m_groupImageType</cstring> </property> @@ -115,7 +115,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_radioFloppy</cstring> </property> @@ -126,7 +126,7 @@ <string>Emulate a 1440/2880 kb floppy</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_radioHarddisk</cstring> </property> @@ -137,7 +137,7 @@ <string>Emulate a harddisk</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_radioNoEmulation</cstring> </property> @@ -150,7 +150,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_groupOptions</cstring> </property> @@ -169,7 +169,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkNoBoot</cstring> </property> @@ -180,7 +180,7 @@ <string>Do not boot from the emulated floppy/harddisk</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkInfoTable</cstring> </property> @@ -188,15 +188,15 @@ <string>Boot-info-table</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>m_editLoadSegment</cstring> </property> @@ -207,7 +207,7 @@ <string>0</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>m_editLoadSize</cstring> </property> @@ -218,7 +218,7 @@ <string>0</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -229,7 +229,7 @@ <string>Boot load segment:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -244,15 +244,15 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout16</cstring> + <cstring>tqlayout16</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonToggleOptions</cstring> </property> @@ -270,7 +270,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>261</width> <height>21</height> @@ -279,15 +279,15 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -295,7 +295,7 @@ <string>Boot catalog:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_editBootCataloge</cstring> </property> @@ -384,10 +384,10 @@ <slot>slotOptionsChanged()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot access="protected">slotOptionsChanged()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/src/projects/base_k3bdataimagesettings.ui b/src/projects/base_k3bdataimagesettings.ui index 3427ab7..2b0e7f3 100644 --- a/src/projects/base_k3bdataimagesettings.ui +++ b/src/projects/base_k3bdataimagesettings.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bDataImageSettings</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>base_K3bDataImageSetings</cstring> </property> @@ -15,7 +15,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_groupVolumeName</cstring> </property> @@ -26,7 +26,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_editVolumeName</cstring> </property> @@ -34,7 +34,7 @@ <number>32</number> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonMoreVolDescFields</cstring> </property> @@ -44,7 +44,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_groupFileSystem</cstring> </property> @@ -61,7 +61,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>m_comboFilesystems</cstring> </property> @@ -77,7 +77,7 @@ <string>File system presets</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonCustomFilesystems</cstring> </property> @@ -87,15 +87,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_groupSymlinks</cstring> </property> @@ -106,7 +106,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>No Change</string> @@ -162,7 +162,7 @@ Be aware that in case Rock Ridge extensions are disabled (which is not recommend </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_groupWhitespace</cstring> </property> @@ -173,7 +173,7 @@ Be aware that in case Rock Ridge extensions are disabled (which is not recommend <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>No Change</string> @@ -222,7 +222,7 @@ If this option is checked, K3b will replace all spaces in all filenames with the Example: 'my good file.ext' becomes 'my_good_file.ext'</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_editReplace</cstring> </property> @@ -258,7 +258,7 @@ Example: 'my good file.ext' becomes 'my_good_file.ext'</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>0</height> @@ -270,5 +270,5 @@ Example: 'my good file.ext' becomes 'my_good_file.ext'</string> <tabstops> <tabstop>m_editReplace</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/src/projects/base_k3bdatavolumedescwidget.ui b/src/projects/base_k3bdatavolumedescwidget.ui index ce31be9..74b9681 100644 --- a/src/projects/base_k3bdatavolumedescwidget.ui +++ b/src/projects/base_k3bdatavolumedescwidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bDataVolumeDescWidget</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>base_K3bDataVolumeDescWidget</cstring> </property> @@ -18,7 +18,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>m_editVolumeName</cstring> </property> @@ -26,7 +26,7 @@ <number>32</number> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>m_editVolumeSetName</cstring> </property> @@ -34,7 +34,7 @@ <number>128</number> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -45,7 +45,7 @@ <cstring>m_editVolumeSetName</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -56,7 +56,7 @@ <cstring>m_editVolumeName</cstring> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>m_editPublisher</cstring> </property> @@ -64,7 +64,7 @@ <number>128</number> </property> </widget> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>m_editPreparer</cstring> </property> @@ -72,7 +72,7 @@ <number>128</number> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -83,7 +83,7 @@ <cstring>m_editPreparer</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -94,7 +94,7 @@ <cstring>m_editPublisher</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -105,15 +105,15 @@ <cstring>m_spinVolumeSetSize</cstring> </property> </widget> - <widget class="QLayoutWidget" row="2" column="1"> + <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>m_spinVolumeSetSize</cstring> </property> @@ -127,21 +127,21 @@ <number>1</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> <property name="text"> <string>Volume set &number:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>m_spinVolumeSetNumber</cstring> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>m_spinVolumeSetNumber</cstring> </property> @@ -160,7 +160,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -171,7 +171,7 @@ <cstring>m_editSystem</cstring> </property> </widget> - <widget class="QLineEdit" row="6" column="1"> + <widget class="TQLineEdit" row="6" column="1"> <property name="name"> <cstring>m_editSystem</cstring> </property> @@ -179,7 +179,7 @@ <number>32</number> </property> </widget> - <widget class="QLabel" row="7" column="0"> + <widget class="TQLabel" row="7" column="0"> <property name="name"> <cstring>TextLabel6</cstring> </property> @@ -200,7 +200,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -221,7 +221,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLineEdit" row="7" column="1"> + <widget class="TQLineEdit" row="7" column="1"> <property name="name"> <cstring>m_editApplication</cstring> </property> @@ -229,15 +229,15 @@ <number>128</number> </property> </widget> - <widget class="QLayoutWidget" row="11" column="1"> + <widget class="TQLayoutWidget" row="11" column="1"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_editBiblio</cstring> </property> @@ -245,7 +245,7 @@ <number>37</number> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_buttonFindBiblio</cstring> </property> @@ -258,15 +258,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="9" column="1"> + <widget class="TQLayoutWidget" row="9" column="1"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_editAbstract</cstring> </property> @@ -274,7 +274,7 @@ <number>37</number> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_buttonFindAbstract</cstring> </property> @@ -287,15 +287,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="10" column="1"> + <widget class="TQLayoutWidget" row="10" column="1"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_editCopyright</cstring> </property> @@ -303,7 +303,7 @@ <number>37</number> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_buttonFindCopyright</cstring> </property> @@ -316,7 +316,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="9" column="0"> + <widget class="TQLabel" row="9" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -324,7 +324,7 @@ <string>Abstract file:</string> </property> </widget> - <widget class="QLabel" row="10" column="0"> + <widget class="TQLabel" row="10" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -332,7 +332,7 @@ <string>Copyright file:</string> </property> </widget> - <widget class="QLabel" row="11" column="0"> + <widget class="TQLabel" row="11" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -366,5 +366,5 @@ <tabstop>m_editSystem</tabstop> <tabstop>m_editApplication</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/src/projects/base_k3bmovixoptionswidget.ui b/src/projects/base_k3bmovixoptionswidget.ui index 973dd11..28b093d 100644 --- a/src/projects/base_k3bmovixoptionswidget.ui +++ b/src/projects/base_k3bmovixoptionswidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bMovixOptionsWidget</class> <author>Sebastian trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> @@ -9,7 +9,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -26,7 +26,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -42,7 +42,7 @@ <string>Select the font to be used to render subtitles</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -53,15 +53,15 @@ <string></string> </property> </widget> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkRandomPlay</cstring> </property> @@ -75,7 +75,7 @@ <string><p>If this option is checked the order in which the files are played is determined randomly every time it is played.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkNoDma</cstring> </property> @@ -91,7 +91,7 @@ </widget> </hbox> </widget> - <widget class="QLineEdit" row="5" column="1"> + <widget class="TQLineEdit" row="5" column="1"> <property name="name"> <cstring>m_editUnwantedMplayerOptions</cstring> </property> @@ -104,7 +104,7 @@ <pre>opt1 opt2 opt3</pre></string> </property> </widget> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>m_editAdditionalMplayerOptions</cstring> </property> @@ -117,7 +117,7 @@ <pre>opt1 opt2 opt3</pre></string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -125,7 +125,7 @@ <string>Additional MPlayer options:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -133,7 +133,7 @@ <string>Loop playlist:</string> </property> </widget> - <widget class="QSpinBox" row="2" column="1"> + <widget class="TQSpinBox" row="2" column="1"> <property name="name"> <cstring>m_spinLoop</cstring> </property> @@ -150,7 +150,7 @@ <string>How many times should the playlist be looped</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>m_labelAudioBackground</cstring> </property> @@ -173,7 +173,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -184,7 +184,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>m_labelKeyboardLayout</cstring> </property> @@ -192,7 +192,7 @@ <string>Keyboard Layout:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -208,7 +208,7 @@ <string>Select the language of the eMovix help screens</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -239,15 +239,15 @@ <cstring>m_comboKeyboardLayout</cstring> </property> <property name="toolTip" stdset="0"> - <string>Select the layout of the keyboard</string> + <string>Select the tqlayout of the keyboard</string> </property> <property name="whatsThis" stdset="0"> - <string><p>The keyboard layout selected here will be used for the eMovix commands like controlling the media player.</string> + <string><p>The keyboard tqlayout selected here will be used for the eMovix commands like controlling the media player.</string> </property> </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -266,7 +266,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkEject</cstring> </property> @@ -280,7 +280,7 @@ <string><p>If this option is checked the disk will be ejected after MPlayer has finished.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkShutdown</cstring> </property> @@ -294,7 +294,7 @@ <string><p>If this option is checked the PC will be shut down after MPlayer has finished playing.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkReboot</cstring> </property> @@ -326,7 +326,7 @@ <slot>setDisabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/src/projects/k3baudioburndialog.cpp b/src/projects/k3baudioburndialog.cpp index 97bf318..4ec9ff3 100644 --- a/src/projects/k3baudioburndialog.cpp +++ b/src/projects/k3baudioburndialog.cpp @@ -30,24 +30,24 @@ #include <k3bwritingmodewidget.h> #include <k3bexternalbinmanager.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qtabwidget.h> -#include <qlayout.h> -#include <qvariant.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qgrid.h> -#include <qtoolbutton.h> -#include <qptrlist.h> -#include <qstringlist.h> -#include <qpoint.h> -#include <qhbox.h> -#include <qspinbox.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> +#include <tqtabwidget.h> +#include <tqlayout.h> +#include <tqvariant.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqgrid.h> +#include <tqtoolbutton.h> +#include <tqptrlist.h> +#include <tqstringlist.h> +#include <tqpoint.h> +#include <tqhbox.h> +#include <tqspinbox.h> #include <klocale.h> #include <kstandarddirs.h> @@ -55,17 +55,17 @@ #include <kmessagebox.h> -K3bAudioBurnDialog::K3bAudioBurnDialog(K3bAudioDoc* _doc, QWidget *parent, const char *name, bool modal ) - : K3bProjectBurnDialog( _doc, parent, name, modal ), +K3bAudioBurnDialog::K3bAudioBurnDialog(K3bAudioDoc* _doc, TQWidget *tqparent, const char *name, bool modal ) + : K3bProjectBurnDialog( _doc, tqparent, name, modal ), m_doc(_doc) { prepareGui(); setTitle( i18n("Audio Project"), i18n("1 track (%1 minutes)", "%n tracks (%1 minutes)", - m_doc->numOfTracks() ).arg(m_doc->length().toString()) ); + m_doc->numOfTracks() ).tqarg(m_doc->length().toString()) ); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); m_optionGroupLayout->addItem( spacer ); // create cd-text page @@ -74,27 +74,27 @@ K3bAudioBurnDialog::K3bAudioBurnDialog(K3bAudioDoc* _doc, QWidget *parent, const // create advanced tab // ---------------------------------------------------------- - QWidget* advancedTab = new QWidget( this ); - QGridLayout* advancedTabGrid = new QGridLayout( advancedTab ); + TQWidget* advancedTab = new TQWidget( this ); + TQGridLayout* advancedTabGrid = new TQGridLayout( advancedTab ); advancedTabGrid->setSpacing( spacingHint() ); advancedTabGrid->setMargin( marginHint() ); - QGroupBox* advancedSettingsGroup = new QGroupBox( 1, Qt::Vertical, i18n("Settings"), advancedTab ); + TQGroupBox* advancedSettingsGroup = new TQGroupBox( 1, Qt::Vertical, i18n("Settings"), advancedTab ); m_checkNormalize = K3bStdGuiItems::normalizeCheckBox( advancedSettingsGroup ); - QGroupBox* advancedGimmickGroup = new QGroupBox( 1, Qt::Vertical, i18n("Gimmicks"), advancedTab ); - m_checkHideFirstTrack = new QCheckBox( i18n( "Hide first track" ), advancedGimmickGroup, "m_checkHideFirstTrack" ); + TQGroupBox* advancedGimmickGroup = new TQGroupBox( 1, Qt::Vertical, i18n("Gimmicks"), advancedTab ); + m_checkHideFirstTrack = new TQCheckBox( i18n( "Hide first track" ), advancedGimmickGroup, "m_checkHideFirstTrack" ); - m_audioRippingGroup = new QGroupBox( 3, Qt::Vertical, i18n("Audio Ripping"), advancedTab ); - QHBox* box = new QHBox( m_audioRippingGroup ); + m_audioRippingGroup = new TQGroupBox( 3, Qt::Vertical, i18n("Audio Ripping"), advancedTab ); + TQHBox* box = new TQHBox( m_audioRippingGroup ); box->setSpacing( spacingHint() ); - box->setStretchFactor(new QLabel( i18n("Paranoia mode:"), box ), 1 ); + box->setStretchFactor(new TQLabel( i18n("Paranoia mode:"), box ), 1 ); m_comboParanoiaMode = K3bStdGuiItems::paranoiaModeComboBox( box ); - box = new QHBox( m_audioRippingGroup ); + box = new TQHBox( m_audioRippingGroup ); box->setSpacing( spacingHint() ); - box->setStretchFactor( new QLabel( i18n("Read retries:"), box ), 1 ); - m_spinAudioRippingReadRetries = new QSpinBox( 1, 128, 1, box ); - m_checkAudioRippingIgnoreReadErrors = new QCheckBox( i18n("Ignore read errors"), m_audioRippingGroup ); + box->setStretchFactor( new TQLabel( i18n("Read retries:"), box ), 1 ); + m_spinAudioRippingReadRetries = new TQSpinBox( 1, 128, 1, box ); + m_checkAudioRippingIgnoreReadErrors = new TQCheckBox( i18n("Ignore read errors"), m_audioRippingGroup ); advancedTabGrid->addWidget( advancedSettingsGroup, 0, 0 ); advancedTabGrid->addWidget( advancedGimmickGroup, 1, 0 ); @@ -103,18 +103,18 @@ K3bAudioBurnDialog::K3bAudioBurnDialog(K3bAudioDoc* _doc, QWidget *parent, const addPage( advancedTab, i18n("Advanced") ); - connect( m_writerSelectionWidget, SIGNAL(writingAppChanged(int)), this, SLOT(slotToggleAll()) ); - connect( m_checkNormalize, SIGNAL(toggled(bool)), this, SLOT(slotNormalizeToggled(bool)) ); - connect( m_checkCacheImage, SIGNAL(toggled(bool)), this, SLOT(slotCacheImageToggled(bool)) ); - connect( m_writingModeWidget, SIGNAL(writingModeChanged(int)), this, SLOT(slotToggleAll()) ); + connect( m_writerSelectionWidget, TQT_SIGNAL(writingAppChanged(int)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_checkNormalize, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotNormalizeToggled(bool)) ); + connect( m_checkCacheImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotCacheImageToggled(bool)) ); + connect( m_writingModeWidget, TQT_SIGNAL(writingModeChanged(int)), this, TQT_SLOT(slotToggleAll()) ); // ToolTips // ------------------------------------------------------------------------- - QToolTip::add( m_checkHideFirstTrack, i18n("Hide the first track in the first pregap") ); + TQToolTip::add( m_checkHideFirstTrack, i18n("Hide the first track in the first pregap") ); // What's This info // ------------------------------------------------------------------------- - QWhatsThis::add( m_checkHideFirstTrack, + TQWhatsThis::add( m_checkHideFirstTrack, i18n("<p>If this option is checked K3b will <em>hide</em> the first track." "<p>The audio CD standard uses pregaps before every track on the CD. " "By default these last for 2 seconds and are silent. In DAO mode it " @@ -262,7 +262,7 @@ void K3bAudioBurnDialog::toggleAll() } -void K3bAudioBurnDialog::showEvent( QShowEvent* e ) +void K3bAudioBurnDialog::showEvent( TQShowEvent* e ) { // we only show the audio ripping options when there are audio cd track sources bool showRipOptions = false; @@ -308,7 +308,7 @@ void K3bAudioBurnDialog::slotNormalizeToggled( bool on ) if( KMessageBox::warningYesNo( this, i18n("<p>K3b is not able to normalize audio tracks when burning on-the-fly. " "The external program used for this task only supports normalizing a set " "of audio files."), - QString::null, + TQString(), i18n("Disable normalization"), i18n("Disable on-the-fly burning"), "audioProjectNormalizeOrOnTheFly" ) == KMessageBox::Yes ) @@ -327,7 +327,7 @@ void K3bAudioBurnDialog::slotCacheImageToggled( bool on ) if( KMessageBox::warningYesNo( this, i18n("<p>K3b is not able to normalize audio tracks when burning on-the-fly. " "The external program used for this task only supports normalizing a set " "of audio files."), - QString::null, + TQString(), i18n("Disable normalization"), i18n("Disable on-the-fly burning"), "audioProjectNormalizeOrOnTheFly" ) == KMessageBox::Yes ) diff --git a/src/projects/k3baudioburndialog.h b/src/projects/k3baudioburndialog.h index 47be09f..64355a2 100644 --- a/src/projects/k3baudioburndialog.h +++ b/src/projects/k3baudioburndialog.h @@ -20,20 +20,20 @@ #include "k3bprojectburndialog.h" -#include <qvariant.h> -#include <qwidget.h> +#include <tqvariant.h> +#include <tqwidget.h> -class QCheckBox; -class QComboBox; -class QGroupBox; -class QLabel; -class QLineEdit; -class QSpinBox; +class TQCheckBox; +class TQComboBox; +class TQGroupBox; +class TQLabel; +class TQLineEdit; +class TQSpinBox; class K3bWriterSelectionWidget; class K3bTempDirSelectionWidget; class K3bAudioDoc; class K3bAudioCdTextWidget; -class QShowEvent; +class TQShowEvent; /** @@ -42,9 +42,10 @@ class QShowEvent; class K3bAudioBurnDialog : public K3bProjectBurnDialog { Q_OBJECT + TQ_OBJECT public: - K3bAudioBurnDialog(K3bAudioDoc* doc, QWidget *parent=0, const char *name=0, bool modal = true ); + K3bAudioBurnDialog(K3bAudioDoc* doc, TQWidget *tqparent=0, const char *name=0, bool modal = true ); ~K3bAudioBurnDialog(); protected: @@ -53,7 +54,7 @@ class K3bAudioBurnDialog : public K3bProjectBurnDialog void loadK3bDefaults(); void loadUserDefaults( KConfigBase* ); void saveUserDefaults( KConfigBase* ); - void showEvent( QShowEvent* ); + void showEvent( TQShowEvent* ); void toggleAll(); protected slots: @@ -68,12 +69,12 @@ class K3bAudioBurnDialog : public K3bProjectBurnDialog /** * We need this here to be able to hide/show the group */ - QGroupBox* m_audioRippingGroup; - QCheckBox* m_checkHideFirstTrack; - QCheckBox* m_checkNormalize; - QCheckBox* m_checkAudioRippingIgnoreReadErrors; - QSpinBox* m_spinAudioRippingReadRetries; - QComboBox* m_comboParanoiaMode; + TQGroupBox* m_audioRippingGroup; + TQCheckBox* m_checkHideFirstTrack; + TQCheckBox* m_checkNormalize; + TQCheckBox* m_checkAudioRippingIgnoreReadErrors; + TQSpinBox* m_spinAudioRippingReadRetries; + TQComboBox* m_comboParanoiaMode; K3bAudioCdTextWidget* m_cdtextWidget; K3bAudioDoc* m_doc; }; diff --git a/src/projects/k3baudiocdtextwidget.cpp b/src/projects/k3baudiocdtextwidget.cpp index 8ee5543..f6237b9 100644 --- a/src/projects/k3baudiocdtextwidget.cpp +++ b/src/projects/k3baudiocdtextwidget.cpp @@ -20,12 +20,12 @@ #include "k3baudiotrack.h" #include <k3bcdtextvalidator.h> -#include <qcheckbox.h> -#include <qtoolbutton.h> -#include <qpushbutton.h> -#include <qptrlist.h> -#include <qlayout.h> -#include <qgroupbox.h> +#include <tqcheckbox.h> +#include <tqtoolbutton.h> +#include <tqpushbutton.h> +#include <tqptrlist.h> +#include <tqlayout.h> +#include <tqgroupbox.h> #include <klineedit.h> #include <klocale.h> @@ -36,8 +36,8 @@ class K3bAudioCdTextWidget::AllFieldsDialog : public KDialogBase { public: - AllFieldsDialog( QWidget* parent ) - : KDialogBase( parent, + AllFieldsDialog( TQWidget* tqparent ) + : KDialogBase( tqparent, "cdtext_allfields_dialog", true, i18n("CD-Text"), @@ -52,8 +52,8 @@ public: }; -K3bAudioCdTextWidget::K3bAudioCdTextWidget( QWidget* parent, const char* name ) - : base_K3bAudioCdTextWidget( parent, name ), +K3bAudioCdTextWidget::K3bAudioCdTextWidget( TQWidget* tqparent, const char* name ) + : base_K3bAudioCdTextWidget( tqparent, name ), m_doc(0) { m_allFieldsDlg = new AllFieldsDialog( this ); @@ -67,7 +67,7 @@ K3bAudioCdTextWidget::K3bAudioCdTextWidget( QWidget* parent, const char* name ) m_allFieldsDlg->w->m_buttonCopyComposer->setPixmap( SmallIcon( "editcopy" ) ); m_allFieldsDlg->w->m_buttonCopyArranger->setPixmap( SmallIcon( "editcopy" ) ); - QValidator* cdTextVal = new K3bCdTextValidator( this ); + TQValidator* cdTextVal = new K3bCdTextValidator( TQT_TQOBJECT(this) ); m_editTitle->setValidator( cdTextVal ); m_editPerformer->setValidator( cdTextVal ); @@ -80,19 +80,19 @@ K3bAudioCdTextWidget::K3bAudioCdTextWidget( QWidget* parent, const char* name ) m_allFieldsDlg->w->m_editSongwriter->setValidator( cdTextVal ); m_allFieldsDlg->w->m_editComposer->setValidator( cdTextVal ); - connect( m_allFieldsDlg->w->m_buttonCopyTitle, SIGNAL(clicked()), - this, SLOT(slotCopyTitle()) ); - connect( m_allFieldsDlg->w->m_buttonCopyPerformer, SIGNAL(clicked()), - this, SLOT(slotCopyPerformer()) ); - connect( m_allFieldsDlg->w->m_buttonCopyArranger, SIGNAL(clicked()), - this, SLOT(slotCopyArranger()) ); - connect( m_allFieldsDlg->w->m_buttonCopySongwriter, SIGNAL(clicked()), - this, SLOT(slotCopySongwriter()) ); - connect( m_allFieldsDlg->w->m_buttonCopyComposer, SIGNAL(clicked()), - this, SLOT(slotCopyComposer()) ); - - connect( m_buttonMoreFields, SIGNAL(clicked()), - this, SLOT(slotMoreFields()) ); + connect( m_allFieldsDlg->w->m_buttonCopyTitle, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotCopyTitle()) ); + connect( m_allFieldsDlg->w->m_buttonCopyPerformer, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotCopyPerformer()) ); + connect( m_allFieldsDlg->w->m_buttonCopyArranger, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotCopyArranger()) ); + connect( m_allFieldsDlg->w->m_buttonCopySongwriter, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotCopySongwriter()) ); + connect( m_allFieldsDlg->w->m_buttonCopyComposer, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotCopyComposer()) ); + + connect( m_buttonMoreFields, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotMoreFields()) ); } @@ -143,17 +143,17 @@ void K3bAudioCdTextWidget::slotMoreFields() m_allFieldsDlg->w->m_editPerformer->setText( m_editPerformer->text() ); // save old settings - QString title = m_allFieldsDlg->w->m_editTitle->text(); - QString performer = m_allFieldsDlg->w->m_editPerformer->text(); - QString disc_id = m_allFieldsDlg->w->m_editDisc_id->text(); - QString upc_ean = m_allFieldsDlg->w->m_editUpc_ean->text(); - QString arranger = m_allFieldsDlg->w->m_editArranger->text(); - QString songwriter = m_allFieldsDlg->w->m_editSongwriter->text(); - QString composer = m_allFieldsDlg->w->m_editComposer->text(); - QString message = m_allFieldsDlg->w->m_editMessage->text(); + TQString title = m_allFieldsDlg->w->m_editTitle->text(); + TQString performer = m_allFieldsDlg->w->m_editPerformer->text(); + TQString disc_id = m_allFieldsDlg->w->m_editDisc_id->text(); + TQString upc_ean = m_allFieldsDlg->w->m_editUpc_ean->text(); + TQString arranger = m_allFieldsDlg->w->m_editArranger->text(); + TQString songwriter = m_allFieldsDlg->w->m_editSongwriter->text(); + TQString composer = m_allFieldsDlg->w->m_editComposer->text(); + TQString message = m_allFieldsDlg->w->m_editMessage->text(); // exec dlg - if( m_allFieldsDlg->exec() == QDialog::Accepted ) { + if( m_allFieldsDlg->exec() == TQDialog::Accepted ) { // accept new entries m_editTitle->setText( m_allFieldsDlg->w->m_editTitle->text() ); m_editPerformer->setText( m_allFieldsDlg->w->m_editPerformer->text() ); diff --git a/src/projects/k3baudiocdtextwidget.h b/src/projects/k3baudiocdtextwidget.h index 49b579f..88ff568 100644 --- a/src/projects/k3baudiocdtextwidget.h +++ b/src/projects/k3baudiocdtextwidget.h @@ -25,9 +25,10 @@ class K3bAudioDoc; class K3bAudioCdTextWidget : public base_K3bAudioCdTextWidget { Q_OBJECT + TQ_OBJECT public: - K3bAudioCdTextWidget( QWidget* parent = 0, const char* name = 0 ); + K3bAudioCdTextWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bAudioCdTextWidget(); bool isChecked() const; diff --git a/src/projects/k3baudiodatasourceeditwidget.cpp b/src/projects/k3baudiodatasourceeditwidget.cpp index d54bb5d..541c946 100644 --- a/src/projects/k3baudiodatasourceeditwidget.cpp +++ b/src/projects/k3baudiodatasourceeditwidget.cpp @@ -19,27 +19,27 @@ #include <k3baudiodatasource.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qtooltip.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqtooltip.h> #include <klocale.h> #include <kdialog.h> -K3bAudioDataSourceEditWidget::K3bAudioDataSourceEditWidget( QWidget* parent, const char* name ) - : QWidget( parent, name ), +K3bAudioDataSourceEditWidget::K3bAudioDataSourceEditWidget( TQWidget* tqparent, const char* name ) + : TQWidget( tqparent, name ), m_source(0) { m_editor = new K3bAudioEditorWidget( this ); m_editStartOffset = new K3bMsfEdit( this ); m_editEndOffset = new K3bMsfEdit( this ); - QLabel* startLabel = new QLabel( i18n("Start Offset") + ":", this ); - QLabel* endLabel = new QLabel( i18n("End Offset") + ":", this ); - endLabel->setAlignment( Qt::AlignRight ); + TQLabel* startLabel = new TQLabel( i18n("Start Offset") + ":", this ); + TQLabel* endLabel = new TQLabel( i18n("End Offset") + ":", this ); + endLabel->tqsetAlignment( TQt::AlignRight ); - QGridLayout* grid = new QGridLayout( this ); + TQGridLayout* grid = new TQGridLayout( this ); grid->setMargin( 0 ); grid->setSpacing( KDialog::spacingHint() ); @@ -51,16 +51,16 @@ K3bAudioDataSourceEditWidget::K3bAudioDataSourceEditWidget( QWidget* parent, con grid->setColStretch( 1, 1 ); // setup connections between the msfedits and the editor - connect( m_editor, SIGNAL(rangeChanged(int, const K3b::Msf&, const K3b::Msf&)), - this, SLOT(slotRangeModified(int, const K3b::Msf&, const K3b::Msf&)) ); + connect( m_editor, TQT_SIGNAL(rangeChanged(int, const K3b::Msf&, const K3b::Msf&)), + this, TQT_SLOT(slotRangeModified(int, const K3b::Msf&, const K3b::Msf&)) ); - connect( m_editStartOffset, SIGNAL(valueChanged(const K3b::Msf&)), - this, SLOT(slotStartOffsetEdited(const K3b::Msf&)) ); + connect( m_editStartOffset, TQT_SIGNAL(valueChanged(const K3b::Msf&)), + this, TQT_SLOT(slotStartOffsetEdited(const K3b::Msf&)) ); - connect( m_editEndOffset, SIGNAL(valueChanged(const K3b::Msf&)), - this, SLOT(slotEndOffsetEdited(const K3b::Msf&)) ); + connect( m_editEndOffset, TQT_SIGNAL(valueChanged(const K3b::Msf&)), + this, TQT_SLOT(slotEndOffsetEdited(const K3b::Msf&)) ); - QToolTip::add( m_editor, i18n("Drag the edges of the highlighted area to define the portion of the " + TQToolTip::add( m_editor, i18n("Drag the edges of the highlighted area to define the portion of the " "audio source you want to include in the Audio CD track. " "You can also use the input windows to fine-tune your selection.") ); } @@ -101,7 +101,7 @@ void K3bAudioDataSourceEditWidget::loadSource( K3bAudioDataSource* source ) false, false, i18n("Used part of the audio source"), - colorGroup().highlight() ); + tqcolorGroup().highlight() ); m_editStartOffset->setMaxValue( source->originalLength().lba() ); m_editEndOffset->setMaxValue( source->originalLength().lba() ); diff --git a/src/projects/k3baudiodatasourceeditwidget.h b/src/projects/k3baudiodatasourceeditwidget.h index 4c9d1cb..10a7ace 100644 --- a/src/projects/k3baudiodatasourceeditwidget.h +++ b/src/projects/k3baudiodatasourceeditwidget.h @@ -16,7 +16,7 @@ #ifndef _K3B_AUDIODATASOURCE_EDITWIDGET_H_ #define _K3B_AUDIODATASOURCE_EDITWIDGET_H_ -#include <qwidget.h> +#include <tqwidget.h> #include <k3bmsf.h> class K3bAudioDataSource; @@ -27,12 +27,13 @@ class K3bMsfEdit; * Widget to modify the start and end offset of a source or simply change * the length of a silence source. */ -class K3bAudioDataSourceEditWidget : public QWidget +class K3bAudioDataSourceEditWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - K3bAudioDataSourceEditWidget( QWidget* parent = 0, const char* name = 0 ); + K3bAudioDataSourceEditWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bAudioDataSourceEditWidget(); K3b::Msf startOffset() const; diff --git a/src/projects/k3baudiodatasourceviewitem.cpp b/src/projects/k3baudiodatasourceviewitem.cpp index 6cf3004..eb70a66 100644 --- a/src/projects/k3baudiodatasourceviewitem.cpp +++ b/src/projects/k3baudiodatasourceviewitem.cpp @@ -23,23 +23,23 @@ #include <kiconloader.h> -K3bAudioDataSourceViewItem::K3bAudioDataSourceViewItem( K3bAudioTrackViewItem* parent, +K3bAudioDataSourceViewItem::K3bAudioDataSourceViewItem( K3bAudioTrackViewItem* tqparent, K3bAudioDataSourceViewItem* after, K3bAudioDataSource* source ) - : K3bListViewItem( parent, after ), - m_trackViewItem( parent ), + : K3bListViewItem( tqparent, after ), + m_trackViewItem( tqparent ), m_source( source ), m_animationCounter(1) { // italic type - QFont f(listView()->font()); + TQFont f(listView()->font()); f.setItalic( true ); setFont( 3, f ); // setMarginVertical( 2 ); // gray out filename - setForegroundColor( 5, listView()->palette().disabled().foreground() ); + setForegroundColor( 5, listView()->tqpalette().disabled().foreground() ); // smaller filename f = listView()->font(); @@ -52,7 +52,7 @@ K3bAudioDataSourceViewItem::K3bAudioDataSourceViewItem( K3bAudioTrackViewItem* p } -QString K3bAudioDataSourceViewItem::text( int i ) const +TQString K3bAudioDataSourceViewItem::text( int i ) const { switch( i ) { case 3: @@ -62,12 +62,12 @@ QString K3bAudioDataSourceViewItem::text( int i ) const case 5: return m_source->sourceComment(); default: - return QString::null; + return TQString(); } } -void K3bAudioDataSourceViewItem::setText( int col, const QString& text ) +void K3bAudioDataSourceViewItem::setText( int col, const TQString& text ) { // // See K3bAudioTrackViewItem::setText for an explanation why we have to check if @@ -89,7 +89,7 @@ void K3bAudioDataSourceViewItem::setText( int col, const QString& text ) bool K3bAudioDataSourceViewItem::animate() { if( source()->length() == 0 && source()->isValid() ) { - QString icon = QString( "kde%1" ).arg( m_animationCounter ); + TQString icon = TQString( "kde%1" ).tqarg( m_animationCounter ); setPixmap( 4, SmallIcon( icon ) ); m_animationCounter++; if ( m_animationCounter > 6 ) diff --git a/src/projects/k3baudiodatasourceviewitem.h b/src/projects/k3baudiodatasourceviewitem.h index 14da1de..7b2fb5a 100644 --- a/src/projects/k3baudiodatasourceviewitem.h +++ b/src/projects/k3baudiodatasourceviewitem.h @@ -25,15 +25,15 @@ class K3bAudioTrackViewItem; class K3bAudioDataSourceViewItem : public K3bListViewItem { public: - K3bAudioDataSourceViewItem( K3bAudioTrackViewItem* parent, + K3bAudioDataSourceViewItem( K3bAudioTrackViewItem* tqparent, K3bAudioDataSourceViewItem* after, K3bAudioDataSource* ); K3bAudioDataSource* source() const { return m_source; } K3bAudioTrackViewItem* trackViewItem() const { return m_trackViewItem; } - QString text( int i ) const; - void setText( int col, const QString& text ); + TQString text( int i ) const; + void setText( int col, const TQString& text ); bool animate(); @@ -42,7 +42,7 @@ class K3bAudioDataSourceViewItem : public K3bListViewItem /** * Does nothing becasue we don't want no branches here. */ - void paintBranches( QPainter*, const QColorGroup &, + void paintBranches( TQPainter*, const TQColorGroup &, int, int, int ) {} private: diff --git a/src/projects/k3baudioeditorwidget.cpp b/src/projects/k3baudioeditorwidget.cpp index 453f76f..186fdb5 100644 --- a/src/projects/k3baudioeditorwidget.cpp +++ b/src/projects/k3baudioeditorwidget.cpp @@ -15,13 +15,13 @@ #include "k3baudioeditorwidget.h" -#include <qpainter.h> -#include <qcolor.h> -#include <qpixmap.h> -#include <qcursor.h> -#include <qapplication.h> -#include <qdesktopwidget.h> -#include <qtooltip.h> +#include <tqpainter.h> +#include <tqcolor.h> +#include <tqpixmap.h> +#include <tqcursor.h> +#include <tqapplication.h> +#include <tqdesktopwidget.h> +#include <tqtooltip.h> @@ -33,8 +33,8 @@ public: const K3b::Msf& e, bool sf, bool ef, - const QString& t, - const QBrush& b ) + const TQString& t, + const TQBrush& b ) : id(i), start(s), end(e), @@ -49,8 +49,8 @@ public: K3b::Msf end; bool startFixed; bool endFixed; - QBrush brush; - QString toolTip; + TQBrush brush; + TQString toolTip; bool operator<( const K3bAudioEditorWidget::Range& r ) { return start < r.start; @@ -70,8 +70,8 @@ public: Marker( int i, const K3b::Msf& msf, bool f, - const QColor& c, - const QString& t ) + const TQColor& c, + const TQString& t ) : id(i), pos(msf), fixed(f), @@ -82,25 +82,25 @@ public: int id; K3b::Msf pos; bool fixed; - QColor color; - QString toolTip; + TQColor color; + TQString toolTip; operator K3b::Msf& () { return pos; } }; -class K3bAudioEditorWidget::RangeList : public QPtrList<K3bAudioEditorWidget::Range> +class K3bAudioEditorWidget::RangeList : public TQPtrList<K3bAudioEditorWidget::Range> { public: RangeList() - : QPtrList<Range>() { + : TQPtrList<Range>() { } RangeList( const RangeList& l ) - : QPtrList<Range>( l ) { + : TQPtrList<Range>( l ) { } - int compareItems( QPtrCollection::Item item1, QPtrCollection::Item item2 ) { + int compareItems( TQPtrCollection::Item item1, TQPtrCollection::Item item2 ) { if( *static_cast<Range*>(item1) > *static_cast<Range*>(item2) ) return 1; else if( *static_cast<Range*>(item1) < *static_cast<Range*>(item2) ) @@ -110,22 +110,22 @@ public: } }; -class K3bAudioEditorWidget::ToolTip : public QToolTip +class K3bAudioEditorWidget::ToolTip : public TQToolTip { public: ToolTip( K3bAudioEditorWidget* w ) - : QToolTip( w ), + : TQToolTip( w ), m_editorWidget( w ) { } protected: - void maybeTip( const QPoint& p ) { - QRect r = m_editorWidget->contentsRect(); + void maybeTip( const TQPoint& p ) { + TQRect r = m_editorWidget->contentsRect(); Marker* m = m_editorWidget->findMarker( p ); if( m ) { r.setLeft( p.x() - 1 ); r.setRight( p.x() + 1 ); - tip( r, m->toolTip.isEmpty() ? m->pos.toString() : QString("%1 (%2)").arg(m->toolTip).arg(m->pos.toString()) ); + tip( r, m->toolTip.isEmpty() ? m->pos.toString() : TQString("%1 (%2)").tqarg(m->toolTip).tqarg(m->pos.toString()) ); } else { Range* range = m_editorWidget->findRange( p ); @@ -134,8 +134,8 @@ protected: r.setRight( m_editorWidget->msfToPos( range->end ) ); tip( r, range->toolTip.isEmpty() - ? QString("%1 - %2").arg(range->start.toString()).arg(range->end.toString()) - : QString("%1 (%2 - %3)").arg(range->toolTip).arg(range->start.toString()).arg(range->end.toString()) ); + ? TQString("%1 - %2").tqarg(range->start.toString()).tqarg(range->end.toString()) + : TQString("%1 (%2 - %3)").tqarg(range->toolTip).tqarg(range->start.toString()).tqarg(range->end.toString()) ); } } } @@ -155,7 +155,7 @@ public: movedRange(0) { } - QBrush selectedRangeBrush; + TQBrush selectedRangeBrush; bool allowOverlappingRanges; bool rangeSelectionEnabled; @@ -168,8 +168,8 @@ public: }; -K3bAudioEditorWidget::K3bAudioEditorWidget( QWidget* parent, const char* name ) - : QFrame( parent, name, Qt::WNoAutoErase ), +K3bAudioEditorWidget::K3bAudioEditorWidget( TQWidget* tqparent, const char* name ) + : TQFrame( tqparent, name, TQt::WNoAutoErase ), m_maxMarkers(1), m_idCnt(1), m_mouseAt(true), @@ -177,12 +177,12 @@ K3bAudioEditorWidget::K3bAudioEditorWidget( QWidget* parent, const char* name ) m_draggedMarker(0) { d = new Private; - d->selectedRangeBrush = colorGroup().highlight(); + d->selectedRangeBrush = TQBrush(tqcolorGroup().highlight()); - setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Minimum ); + tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ); setFrameStyle( StyledPanel|Sunken ); setMouseTracking(true); - setCursor( Qt::PointingHandCursor ); + setCursor( TQt::PointingHandCursor ); m_margin = 5; @@ -201,23 +201,23 @@ K3bAudioEditorWidget::~K3bAudioEditorWidget() } -QSize K3bAudioEditorWidget::minimumSizeHint() const +TQSize K3bAudioEditorWidget::tqminimumSizeHint() const { constPolish(); // some fixed height minimum and enough space for a tickmark every minute // But never exceed 2/3 of the the screen width, otherwise it just looks ugly // FIXME: this is still bad for long sources and there might be 60 minutes sources! - int maxWidth = QApplication::desktop()->width()*2/3; + int maxWidth = TQApplication::desktop()->width()*2/3; int wantedWidth = 2*m_margin + 2*frameWidth() + (m_length.totalFrames()/75/60 + 1) * fontMetrics().width( "000" ); - return QSize( QMIN( maxWidth, wantedWidth ), + return TQSize( TQMIN( maxWidth, wantedWidth ), 2*m_margin + 12 + 6 /*12 for the tickmarks and 6 for the markers */ + fontMetrics().height() + 2*frameWidth() ); } -QSize K3bAudioEditorWidget::sizeHint() const +TQSize K3bAudioEditorWidget::tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } @@ -236,13 +236,13 @@ const K3b::Msf K3bAudioEditorWidget::length() const } -void K3bAudioEditorWidget::setSelectedRangeBrush( const QBrush& b ) +void K3bAudioEditorWidget::setSelectedRangeBrush( const TQBrush& b ) { d->selectedRangeBrush = b; } -const QBrush& K3bAudioEditorWidget::selectedRangeBrush() const +const TQBrush& K3bAudioEditorWidget::selectedRangeBrush() const { return d->selectedRangeBrush; } @@ -263,7 +263,7 @@ bool K3bAudioEditorWidget::allowOverlappingRanges() const void K3bAudioEditorWidget::enableRangeSelection( bool b ) { d->rangeSelectionEnabled = b; - repaint( false ); + tqrepaint( false ); } @@ -283,7 +283,7 @@ void K3bAudioEditorWidget::setSelectedRange( K3bAudioEditorWidget::Range* r ) { d->selectedRange = r; if( rangeSelectedEnabled() ) { - repaint( false ); + tqrepaint( false ); emit selectedRangeChanged( d->selectedRange ? d->selectedRange->id : 0 ); } } @@ -300,18 +300,18 @@ int K3bAudioEditorWidget::selectedRange() const int K3bAudioEditorWidget::addRange( const K3b::Msf& start, const K3b::Msf& end, bool startFixed, bool endFixed, - const QString& toolTip, - const QBrush& brush ) + const TQString& toolTip, + const TQBrush& brush ) { if( start > end || end > m_length-1 ) return -1; Range* r = new Range( m_idCnt++, start, end, startFixed, endFixed, toolTip, - brush.style() != QBrush::NoBrush ? brush : QBrush(colorGroup().background()) ); + brush.style() != TQBrush::NoBrush ? brush : TQBrush(tqcolorGroup().background()) ); d->ranges.inSort( r ); // only update the changed range - QRect rect = contentsRect(); + TQRect rect = contentsRect(); rect.setLeft( msfToPos( start ) ); rect.setRight( msfToPos( end ) ); update( rect ); @@ -322,7 +322,7 @@ int K3bAudioEditorWidget::addRange( const K3b::Msf& start, const K3b::Msf& end, int K3bAudioEditorWidget::findRange( int pos ) const { - Range* r = findRange( QPoint( pos, 0 ) ); + Range* r = findRange( TQPoint( pos, 0 ) ); if( r ) return r->id; else @@ -332,7 +332,7 @@ int K3bAudioEditorWidget::findRange( int pos ) const int K3bAudioEditorWidget::findRangeEdge( int pos, bool* end ) const { - Range* r = findRangeEdge( QPoint( pos, 0 ), end ); + Range* r = findRangeEdge( TQPoint( pos, 0 ), end ); if( r ) return r->id; else @@ -356,7 +356,7 @@ bool K3bAudioEditorWidget::modifyRange( int identifier, const K3b::Msf& start, c if( !d->allowOverlappingRanges ) fixupOverlappingRanges( range ); - repaint( false ); + tqrepaint( false ); return true; } @@ -372,8 +372,8 @@ bool K3bAudioEditorWidget::removeRange( int identifier ) emit rangeRemoved( identifier ); - // repaint only the part of the range - QRect rect = contentsRect(); + // tqrepaint only the part of the range + TQRect rect = contentsRect(); rect.setLeft( msfToPos( range->start ) ); rect.setRight( msfToPos( range->end ) ); @@ -409,11 +409,11 @@ K3b::Msf K3bAudioEditorWidget::rangeEnd( int identifier ) const } -QValueList<int> K3bAudioEditorWidget::allRanges() const +TQValueList<int> K3bAudioEditorWidget::allRanges() const { - QValueList<int> l; + TQValueList<int> l; d->ranges.sort(); - for( QPtrListIterator<Range> it( d->ranges ); *it; ++it ) + for( TQPtrListIterator<Range> it( d->ranges ); *it; ++it ) l.append( (*it)->id ); return l; } @@ -424,16 +424,16 @@ void K3bAudioEditorWidget::setMaxNumberOfMarkers( int i ) m_maxMarkers = i; // remove last markers - while( m_markers.count() > QMAX( 1, m_maxMarkers ) ) { + while( m_markers.count() > TQMAX( 1, m_maxMarkers ) ) { removeMarker( m_markers.getLast()->id ); } } -int K3bAudioEditorWidget::addMarker( const K3b::Msf& pos, bool fixed, const QString& toolTip, const QColor& color ) +int K3bAudioEditorWidget::addMarker( const K3b::Msf& pos, bool fixed, const TQString& toolTip, const TQColor& color ) { if( pos < m_length ) { - Marker* m = new Marker( m_idCnt++, pos, fixed, color.isValid() ? color : colorGroup().foreground(), toolTip ); + Marker* m = new Marker( m_idCnt++, pos, fixed, color.isValid() ? color : tqcolorGroup().foreground(), toolTip ); m_markers.inSort( m ); return m->id; } @@ -450,7 +450,7 @@ bool K3bAudioEditorWidget::removeMarker( int identifier ) emit markerRemoved( identifier ); // TODO: in case a marker is bigger than one pixel this needs to be changed - QRect rect = contentsRect(); + TQRect rect = contentsRect(); rect.setLeft( msfToPos( m->pos ) ); rect.setRight( msfToPos( m->pos ) ); delete m; @@ -468,9 +468,9 @@ bool K3bAudioEditorWidget::moveMarker( int identifier, const K3b::Msf& pos ) { if( pos < m_length ) if( Marker* m = getMarker( identifier ) ) { - QRect rect = contentsRect(); - rect.setLeft( QMIN( msfToPos( pos ), msfToPos( m->pos ) ) ); - rect.setRight( QMAX( msfToPos( pos ), msfToPos( m->pos ) ) ); + TQRect rect = contentsRect(); + rect.setLeft( TQMIN( msfToPos( pos ), msfToPos( m->pos ) ) ); + rect.setRight( TQMAX( msfToPos( pos ), msfToPos( m->pos ) ) ); m->pos = pos; @@ -484,20 +484,20 @@ bool K3bAudioEditorWidget::moveMarker( int identifier, const K3b::Msf& pos ) } -void K3bAudioEditorWidget::drawContents( QPainter* p ) +void K3bAudioEditorWidget::drawContents( TQPainter* p ) { // double buffering - QPixmap pix( contentsRect().size() ); - pix.fill( colorGroup().base() ); + TQPixmap pix( contentsRect().size() ); + pix.fill( tqcolorGroup().base() ); - QPainter pixP; - pixP.begin( &pix, this ); + TQPainter pixP; + pixP.tqbegin( &pix, TQT_TQOBJECT(this) ); - QRect drawRect( contentsRect() ); + TQRect drawRect( contentsRect() ); drawRect.setLeft( drawRect.left() + m_margin ); drawRect.setRight( drawRect.right() - m_margin ); - // from minimumSizeHint() + // from tqminimumSizeHint() // int neededHeight = fontMetrics().height() + 12 + 6; // drawRect.setTop( drawRect.top() + (drawRect.height() - neededHeight)/2 ); @@ -510,24 +510,24 @@ void K3bAudioEditorWidget::drawContents( QPainter* p ) pixP.end(); - QRect rect = p->clipRegion().boundingRect(); - QRect pixRect = rect; + TQRect rect = p->clipRegion().boundingRect(); + TQRect pixRect = rect; pixRect.moveBy( -1*frameWidth(), -1*frameWidth() ); bitBlt( this, rect.topLeft(), &pix, pixRect ); } -void K3bAudioEditorWidget::drawAll( QPainter* p, const QRect& drawRect ) +void K3bAudioEditorWidget::drawAll( TQPainter* p, const TQRect& drawRect ) { // we simply draw the ranges one after the other. - for( QPtrListIterator<Range> it( d->ranges ); *it; ++it ) + for( TQPtrListIterator<Range> it( d->ranges ); *it; ++it ) drawRange( p, drawRect, *it ); // Hack to make sure the currently selected range is always on top if( d->selectedRange ) drawRange( p, drawRect, d->selectedRange ); - for( QPtrListIterator<Marker> it( m_markers ); *it; ++it ) + for( TQPtrListIterator<Marker> it( m_markers ); *it; ++it ) drawMarker( p, drawRect, *it ); @@ -547,7 +547,7 @@ void K3bAudioEditorWidget::drawAll( QPainter* p, const QRect& drawRect ) int minute = 1; int minuteStep = 1; int markerVPos = drawRect.bottom(); - int maxMarkerWidth = fontMetrics().width( QString::number(m_length.minutes()) ); + int maxMarkerWidth = fontMetrics().width( TQString::number(m_length.minutes()) ); int minNeededSpace = maxMarkerWidth + 1; int x = 0; while( minute*60*75 < m_length ) { @@ -556,11 +556,11 @@ void K3bAudioEditorWidget::drawAll( QPainter* p, const QRect& drawRect ) // only draw the mark if we have anough space if( newX - x >= minNeededSpace ) { p->drawLine( newX, markerVPos, newX, markerVPos-5 ); - QRect txtRect( newX-(maxMarkerWidth/2), + TQRect txtRect( newX-(maxMarkerWidth/2), markerVPos - 6 - fontMetrics().height(), maxMarkerWidth, fontMetrics().height() ); - p->drawText( txtRect, Qt::AlignCenter, QString::number(minute) ); + p->drawText( txtRect, TQt::AlignCenter, TQString::number(minute) ); // FIXME: draw second markers if we have enough space @@ -579,7 +579,7 @@ void K3bAudioEditorWidget::drawAll( QPainter* p, const QRect& drawRect ) } -void K3bAudioEditorWidget::drawRange( QPainter* p, const QRect& drawRect, K3bAudioEditorWidget::Range* r ) +void K3bAudioEditorWidget::drawRange( TQPainter* p, const TQRect& drawRect, K3bAudioEditorWidget::Range* r ) { p->save(); @@ -597,7 +597,7 @@ void K3bAudioEditorWidget::drawRange( QPainter* p, const QRect& drawRect, K3bAud } -void K3bAudioEditorWidget::drawMarker( QPainter* p, const QRect& drawRect, K3bAudioEditorWidget::Marker* m ) +void K3bAudioEditorWidget::drawMarker( TQPainter* p, const TQRect& drawRect, K3bAudioEditorWidget::Marker* m ) { p->save(); @@ -607,7 +607,7 @@ void K3bAudioEditorWidget::drawMarker( QPainter* p, const QRect& drawRect, K3bAu int x = msfToPos( m->pos ); p->drawLine( x, drawRect.bottom(), x, drawRect.top() ); - QPointArray points( 3 ); + TQPointArray points( 3 ); points.setPoint( 0, x, drawRect.top() + 6 ); points.setPoint( 1, x-3, drawRect.top() ); points.setPoint( 2, x+3, drawRect.top() ); @@ -621,7 +621,7 @@ void K3bAudioEditorWidget::fixupOverlappingRanges( Range* r ) { // copy the list to avoid problems with the iterator RangeList ranges( d->ranges ); - for( QPtrListIterator<Range> it( ranges ); *it; ++it ) { + for( TQPtrListIterator<Range> it( ranges ); *it; ++it ) { Range* range = *it; if( range != r ) { // remove the range if it is covered completely @@ -659,7 +659,7 @@ void K3bAudioEditorWidget::fixupOverlappingRanges( Range* r ) } -void K3bAudioEditorWidget::mousePressEvent( QMouseEvent* e ) +void K3bAudioEditorWidget::mousePressEvent( TQMouseEvent* e ) { m_draggedRange = 0; m_draggedMarker = 0; @@ -678,11 +678,11 @@ void K3bAudioEditorWidget::mousePressEvent( QMouseEvent* e ) m_draggedMarker = findMarker( e->pos() ); } - QFrame::mousePressEvent(e); + TQFrame::mousePressEvent(e); } -void K3bAudioEditorWidget::mouseReleaseEvent( QMouseEvent* e ) +void K3bAudioEditorWidget::mouseReleaseEvent( TQMouseEvent* e ) { if( !d->allowOverlappingRanges ) { // @@ -690,11 +690,11 @@ void K3bAudioEditorWidget::mouseReleaseEvent( QMouseEvent* e ) // if( m_draggedRange ) { fixupOverlappingRanges( m_draggedRange ); - repaint( false ); + tqrepaint( false ); } else if( d->movedRange ) { fixupOverlappingRanges( d->movedRange ); - repaint( false ); + tqrepaint( false ); } } @@ -702,17 +702,17 @@ void K3bAudioEditorWidget::mouseReleaseEvent( QMouseEvent* e ) m_draggedMarker = 0; d->movedRange = 0; - QFrame::mouseReleaseEvent(e); + TQFrame::mouseReleaseEvent(e); } -void K3bAudioEditorWidget::mouseDoubleClickEvent( QMouseEvent* e ) +void K3bAudioEditorWidget::mouseDoubleClickEvent( TQMouseEvent* e ) { - QFrame::mouseDoubleClickEvent(e); + TQFrame::mouseDoubleClickEvent(e); } -void K3bAudioEditorWidget::mouseMoveEvent( QMouseEvent* e ) +void K3bAudioEditorWidget::mouseMoveEvent( TQMouseEvent* e ) { if( m_mouseAt ) emit mouseAt( posToMsf( e->pos().x() ) ); @@ -720,7 +720,7 @@ void K3bAudioEditorWidget::mouseMoveEvent( QMouseEvent* e ) if( e->state() & Qt::LeftButton ) { if( m_draggedRange ) { // determine the position the range's end was dragged to and its other end - K3b::Msf msfPos = QMAX( 0, QMIN( posToMsf( e->pos().x() ), m_length-1 ) ); + K3b::Msf msfPos = TQMAX( 0, TQMIN( posToMsf( e->pos().x() ), m_length-1 ) ); K3b::Msf otherEnd = ( m_draggingRangeEnd ? m_draggedRange->start : m_draggedRange->end ); // move it to the new pos @@ -739,13 +739,13 @@ void K3bAudioEditorWidget::mouseMoveEvent( QMouseEvent* e ) emit rangeChanged( m_draggedRange->id, m_draggedRange->start, m_draggedRange->end ); - repaint( false ); + tqrepaint( false ); } else if( m_draggedMarker ) { m_draggedMarker->pos = posToMsf( e->pos().x() ); emit markerMoved( m_draggedMarker->id, m_draggedMarker->pos ); - repaint( false ); + tqrepaint( false ); } else if( d->movedRange ) { int diff = posToMsf( e->pos().x() ).lba() - d->lastMovePosition.lba(); @@ -763,21 +763,21 @@ void K3bAudioEditorWidget::mouseMoveEvent( QMouseEvent* e ) emit rangeChanged( d->movedRange->id, d->movedRange->start, d->movedRange->end ); - repaint( false ); + tqrepaint( false ); } } else if( findRangeEdge( e->pos() ) || findMarker( e->pos() ) ) - setCursor( Qt::SizeHorCursor ); + setCursor( TQt::SizeHorCursor ); else - setCursor( Qt::PointingHandCursor ); + setCursor( TQt::PointingHandCursor ); - QFrame::mouseMoveEvent(e); + TQFrame::mouseMoveEvent(e); } K3bAudioEditorWidget::Range* K3bAudioEditorWidget::getRange( int i ) const { - for( QPtrListIterator<Range> it( d->ranges ); *it; ++it ) + for( TQPtrListIterator<Range> it( d->ranges ); *it; ++it ) if( (*it)->id == i ) return *it; @@ -785,11 +785,11 @@ K3bAudioEditorWidget::Range* K3bAudioEditorWidget::getRange( int i ) const } -K3bAudioEditorWidget::Range* K3bAudioEditorWidget::findRange( const QPoint& p ) const +K3bAudioEditorWidget::Range* K3bAudioEditorWidget::findRange( const TQPoint& p ) const { // TODO: binary search; maybe store start and end positions in sorted lists for quick searching // this might be a stupid approach but we do not have many ranges anyway - for( QPtrListIterator<Range> it( d->ranges ); *it; ++it ) { + for( TQPtrListIterator<Range> it( d->ranges ); *it; ++it ) { Range* range = *it; int start = msfToPos( range->start ); int end = msfToPos( range->end ); @@ -802,11 +802,11 @@ K3bAudioEditorWidget::Range* K3bAudioEditorWidget::findRange( const QPoint& p ) } -K3bAudioEditorWidget::Range* K3bAudioEditorWidget::findRangeEdge( const QPoint& p, bool* isEnd ) const +K3bAudioEditorWidget::Range* K3bAudioEditorWidget::findRangeEdge( const TQPoint& p, bool* isEnd ) const { // TODO: binary search // this might be a stupid approach but we do not have many ranges anyway - for( QPtrListIterator<Range> it( d->ranges ); *it; ++it ) { + for( TQPtrListIterator<Range> it( d->ranges ); *it; ++it ) { Range* range = *it; int start = msfToPos( range->start ); int end = msfToPos( range->end ); @@ -833,7 +833,7 @@ K3bAudioEditorWidget::Range* K3bAudioEditorWidget::findRangeEdge( const QPoint& K3bAudioEditorWidget::Marker* K3bAudioEditorWidget::getMarker( int i ) const { - for( QPtrListIterator<Marker> it( m_markers ); *it; ++it ) + for( TQPtrListIterator<Marker> it( m_markers ); *it; ++it ) if( (*it)->id == i ) return *it; @@ -841,10 +841,10 @@ K3bAudioEditorWidget::Marker* K3bAudioEditorWidget::getMarker( int i ) const } -K3bAudioEditorWidget::Marker* K3bAudioEditorWidget::findMarker( const QPoint& p ) const +K3bAudioEditorWidget::Marker* K3bAudioEditorWidget::findMarker( const TQPoint& p ) const { // TODO: binary search - for( QPtrListIterator<Marker> it( m_markers ); *it; ++it ) { + for( TQPtrListIterator<Marker> it( m_markers ); *it; ++it ) { Marker* marker = *it; int start = msfToPos( marker->pos ); @@ -860,7 +860,7 @@ K3bAudioEditorWidget::Marker* K3bAudioEditorWidget::findMarker( const QPoint& p K3b::Msf K3bAudioEditorWidget::posToMsf( int p ) const { int w = contentsRect().width() - 2*m_margin; - int x = QMIN( p-frameWidth()-m_margin, w ); + int x = TQMIN( p-frameWidth()-m_margin, w ); return ( (int)((double)(m_length.lba()-1) / (double)w * (double)x) ); } @@ -870,7 +870,7 @@ int K3bAudioEditorWidget::msfToPos( const K3b::Msf& msf ) const { int w = contentsRect().width() - 2*m_margin; int pos = (int)((double)w / (double)(m_length.lba()-1) * (double)msf.lba()); - return frameWidth() + m_margin + QMIN( pos, w-1 ); + return frameWidth() + m_margin + TQMIN( pos, w-1 ); } diff --git a/src/projects/k3baudioeditorwidget.h b/src/projects/k3baudioeditorwidget.h index 6e939d7..fdb3088 100644 --- a/src/projects/k3baudioeditorwidget.h +++ b/src/projects/k3baudioeditorwidget.h @@ -16,25 +16,26 @@ #ifndef _K3B_AUDIO_EDITOR_WIDGET_H_ #define _K3B_AUDIO_EDITOR_WIDGET_H_ -#include <qframe.h> -#include <qptrlist.h> +#include <tqframe.h> +#include <tqptrlist.h> #include <k3bmsf.h> -class QPainter; +class TQPainter; -class K3bAudioEditorWidget : public QFrame +class K3bAudioEditorWidget : public TQFrame { Q_OBJECT + TQ_OBJECT public: - K3bAudioEditorWidget( QWidget* parent = 0, const char* name = 0 ); + K3bAudioEditorWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bAudioEditorWidget(); - QSize sizeHint() const; - QSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; /** * For now the Editor has only one parameter: the length data. @@ -53,8 +54,8 @@ class K3bAudioEditorWidget : public QFrame */ int addRange( const K3b::Msf& start, const K3b::Msf& end, bool startFixed = false, bool endFixed = false, - const QString& toolTip = QString::null, - const QBrush& brush = QBrush() ); + const TQString& toolTip = TQString(), + const TQBrush& brush = TQBrush() ); /** * \returns the identifier of the range which spans over x position \a pos or @@ -86,7 +87,7 @@ class K3bAudioEditorWidget : public QFrame * \return A list of all ranges' identifiers sorted ascending by start * offset */ - QValueList<int> allRanges() const; + TQValueList<int> allRanges() const; void setMaxNumberOfMarkers( int ); @@ -95,7 +96,7 @@ class K3bAudioEditorWidget : public QFrame * @return -1 on error or an identifier on success. */ int addMarker( const K3b::Msf& pos, bool fixed = false, - const QString& toolTip = QString::null, const QColor& color = QColor() ); + const TQString& toolTip = TQString(), const TQColor& color = TQColor() ); /** * @return false if the marker does not exist. @@ -140,10 +141,10 @@ class K3bAudioEditorWidget : public QFrame int msfToPos( const K3b::Msf& msf ) const; /** - * Set the brush to paint the selected range. Default is QColorGroup::Highlight + * Set the brush to paint the selected range. Default is TQColorGroup::Highlight */ - void setSelectedRangeBrush( const QBrush& ); - const QBrush& selectedRangeBrush() const; + void setSelectedRangeBrush( const TQBrush& ); + const TQBrush& selectedRangeBrush() const; signals: /** @@ -177,14 +178,14 @@ class K3bAudioEditorWidget : public QFrame class Private; Private* d; - void mousePressEvent( QMouseEvent* e ); - void mouseReleaseEvent( QMouseEvent* e ); - void mouseDoubleClickEvent( QMouseEvent* e ); - void mouseMoveEvent( QMouseEvent* e ); - void drawContents( QPainter* ); - void drawAll( QPainter*, const QRect& ); - void drawRange( QPainter* p, const QRect&, Range* r ); - void drawMarker( QPainter* p, const QRect&, Marker* m ); + void mousePressEvent( TQMouseEvent* e ); + void mouseReleaseEvent( TQMouseEvent* e ); + void mouseDoubleClickEvent( TQMouseEvent* e ); + void mouseMoveEvent( TQMouseEvent* e ); + void drawContents( TQPainter* ); + void drawAll( TQPainter*, const TQRect& ); + void drawRange( TQPainter* p, const TQRect&, Range* r ); + void drawMarker( TQPainter* p, const TQRect&, Marker* m ); /** * Makes sure that \a r does not overlap any other range by modifying and @@ -194,14 +195,14 @@ class K3bAudioEditorWidget : public QFrame Range* getRange( int i ) const; Marker* getMarker( int i ) const; - Range* findRange( const QPoint& p ) const; - Range* findRangeEdge( const QPoint& p, bool* end = 0 ) const; - Marker* findMarker( const QPoint& p ) const; + Range* findRange( const TQPoint& p ) const; + Range* findRangeEdge( const TQPoint& p, bool* end = 0 ) const; + Marker* findMarker( const TQPoint& p ) const; void setSelectedRange( Range* ); int m_maxMarkers; K3b::Msf m_length; - QPtrList<Marker> m_markers; + TQPtrList<Marker> m_markers; int m_idCnt; bool m_mouseAt; diff --git a/src/projects/k3baudiotrackaddingdialog.cpp b/src/projects/k3baudiotrackaddingdialog.cpp index dfbcbb9..1e540e2 100644 --- a/src/projects/k3baudiotrackaddingdialog.cpp +++ b/src/projects/k3baudiotrackaddingdialog.cpp @@ -29,11 +29,11 @@ #include <kdebug.h> #include <kmessagebox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qfileinfo.h> -#include <qtimer.h> -#include <qdir.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqfileinfo.h> +#include <tqtimer.h> +#include <tqdir.h> class K3bAudioTrackAddingDialog::AnalyserThread : public K3bThread @@ -54,31 +54,31 @@ public: }; -K3bAudioTrackAddingDialog::K3bAudioTrackAddingDialog( QWidget* parent, const char* name ) +K3bAudioTrackAddingDialog::K3bAudioTrackAddingDialog( TQWidget* tqparent, const char* name ) : KDialogBase( Plain, i18n("Please be patient..."), Cancel, Cancel, - parent, + tqparent, name, true, true ), m_bCanceled(false) { - QWidget* page = plainPage(); - QGridLayout* grid = new QGridLayout( page ); + TQWidget* page = plainPage(); + TQGridLayout* grid = new TQGridLayout( page ); grid->setSpacing( spacingHint() ); grid->setMargin( marginHint() ); - m_infoLabel = new QLabel( page ); + m_infoLabel = new TQLabel( page ); m_busyWidget = new K3bBusyWidget( page ); grid->addWidget( m_infoLabel, 0, 0 ); grid->addWidget( m_busyWidget, 1, 0 ); m_analyserThread = new AnalyserThread(); - m_analyserJob = new K3bThreadJob( m_analyserThread, this, this ); - connect( m_analyserJob, SIGNAL(finished(bool)), this, SLOT(slotAnalysingFinished(bool)) ); + m_analyserJob = new K3bThreadJob( m_analyserThread, this, TQT_TQOBJECT(this) ); + connect( m_analyserJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotAnalysingFinished(bool)) ); } @@ -91,48 +91,48 @@ K3bAudioTrackAddingDialog::~K3bAudioTrackAddingDialog() int K3bAudioTrackAddingDialog::addUrls( const KURL::List& urls, K3bAudioDoc* doc, K3bAudioTrack* afterTrack, - K3bAudioTrack* parentTrack, + K3bAudioTrack* tqparentTrack, K3bAudioDataSource* afterSource, - QWidget* parent ) + TQWidget* tqparent ) { if( urls.isEmpty() ) return 0; - K3bAudioTrackAddingDialog dlg( parent ); + K3bAudioTrackAddingDialog dlg( tqparent ); dlg.m_urls = extractUrlList( urls ); dlg.m_doc = doc; dlg.m_trackAfter = afterTrack; - dlg.m_parentTrack = parentTrack; + dlg.m_parentTrack = tqparentTrack; dlg.m_sourceAfter = afterSource; - dlg.m_infoLabel->setText( i18n("Adding files to project \"%1\"...").arg(doc->URL().fileName()) ); + dlg.m_infoLabel->setText( i18n("Adding files to project \"%1\"...").tqarg(doc->URL().fileName()) ); dlg.m_busyWidget->showBusy(true); - QTimer::singleShot( 0, &dlg, SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, &dlg, TQT_SLOT(slotAddUrls()) ); int ret = dlg.exec(); - QString message; + TQString message; if( !dlg.m_unreadableFiles.isEmpty() ) - message += QString("<p><b>%1:</b><br>%2") - .arg( i18n("Insufficient permissions to read the following files") ) - .arg( dlg.m_unreadableFiles.join( "<br>" ) ); + message += TQString("<p><b>%1:</b><br>%2") + .tqarg( i18n("Insufficient permissions to read the following files") ) + .tqarg( dlg.m_unreadableFiles.join( "<br>" ) ); if( !dlg.m_notFoundFiles.isEmpty() ) - message += QString("<p><b>%1:</b><br>%2") - .arg( i18n("Unable to find the following files") ) - .arg( dlg.m_notFoundFiles.join( "<br>" ) ); + message += TQString("<p><b>%1:</b><br>%2") + .tqarg( i18n("Unable to find the following files") ) + .tqarg( dlg.m_notFoundFiles.join( "<br>" ) ); if( !dlg.m_nonLocalFiles.isEmpty() ) - message += QString("<p><b>%1:</b><br>%2") - .arg( i18n("No non-local files supported") ) - .arg( dlg.m_unreadableFiles.join( "<br>" ) ); + message += TQString("<p><b>%1:</b><br>%2") + .tqarg( i18n("No non-local files supported") ) + .tqarg( dlg.m_unreadableFiles.join( "<br>" ) ); if( !dlg.m_unsupportedFiles.isEmpty() ) - message += QString("<p><b>%1:</b><br><i>%2</i><br>%3") - .arg( i18n("Unable to handle the following files due to an unsupported format" ) ) - .arg( i18n("You may manually convert these audio files to wave using another " + message += TQString("<p><b>%1:</b><br><i>%2</i><br>%3") + .tqarg( i18n("Unable to handle the following files due to an unsupported format" ) ) + .tqarg( i18n("You may manually convert these audio files to wave using another " "application supporting the audio format and then add the wave files " "to the K3b project.") ) - .arg( dlg.m_unsupportedFiles.join( "<br>" ) ); + .tqarg( dlg.m_unsupportedFiles.join( "<br>" ) ); if( !message.isEmpty() ) - KMessageBox::detailedSorry( parent, i18n("Problems while adding files to the project."), message ); + KMessageBox::detailedSorry( tqparent, i18n("Problems while adding files to the project."), message ); return ret; } @@ -162,14 +162,14 @@ void K3bAudioTrackAddingDialog::slotAddUrls() } } - m_infoLabel->setText( i18n("Analysing file '%1'...").arg( url.fileName() ) ); + m_infoLabel->setText( i18n("Analysing file '%1'...").tqarg( url.fileName() ) ); if( !url.isLocalFile() ) { valid = false; m_nonLocalFiles.append( url.path() ); } else { - QFileInfo fi( url.path() ); + TQFileInfo fi( url.path() ); if( !fi.exists() ) { valid = false; m_notFoundFiles.append( url.path() ); @@ -199,7 +199,7 @@ void K3bAudioTrackAddingDialog::slotAddUrls() // invalid file, next url if( !valid ) { m_urls.remove( m_urls.begin() ); - QTimer::singleShot( 0, this, SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(slotAddUrls()) ); } } @@ -251,7 +251,7 @@ void K3bAudioTrackAddingDialog::slotAnalysingFinished( bool /*success*/ ) } } - QTimer::singleShot( 0, this, SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(slotAddUrls()) ); } @@ -271,16 +271,16 @@ KURL::List K3bAudioTrackAddingDialog::extractUrlList( const KURL::List& urls ) while( it != allUrls.end() ) { const KURL& url = *it; - QFileInfo fi( url.path() ); + TQFileInfo fi( url.path() ); if( fi.isDir() ) { it = allUrls.remove( it ); // add all files in the dir - QDir dir(fi.filePath()); - QStringList entries = dir.entryList( QDir::Files ); + TQDir dir(fi.filePath()); + TQStringList entries = dir.entryList( TQDir::Files ); KURL::List::iterator oldIt = it; // add all files into the list after the current item - for( QStringList::iterator dirIt = entries.begin(); + for( TQStringList::iterator dirIt = entries.begin(); dirIt != entries.end(); ++dirIt ) it = allUrls.insert( oldIt, KURL::fromPathOrURL( dir.absPath() + "/" + *dirIt ) ); } diff --git a/src/projects/k3baudiotrackaddingdialog.h b/src/projects/k3baudiotrackaddingdialog.h index 4590e95..3482771 100644 --- a/src/projects/k3baudiotrackaddingdialog.h +++ b/src/projects/k3baudiotrackaddingdialog.h @@ -19,11 +19,11 @@ #include <k3bjobhandler.h> #include <kdialogbase.h> #include <kurl.h> -#include <qstringlist.h> +#include <tqstringlist.h> class K3bBusyWidget; -class QLabel; +class TQLabel; class K3bAudioTrack; class K3bAudioDataSource; class K3bThreadJob; @@ -33,6 +33,7 @@ class K3bAudioDoc; class K3bAudioTrackAddingDialog : public KDialogBase, public K3bJobHandler { Q_OBJECT + TQ_OBJECT public: ~K3bAudioTrackAddingDialog(); @@ -43,31 +44,31 @@ class K3bAudioTrackAddingDialog : public KDialogBase, public K3bJobHandler int waitForMedia( K3bDevice::Device*, int = K3bDevice::STATE_EMPTY, int = K3bDevice::MEDIA_WRITABLE_CD, - const QString& = QString::null ) { return 0; } + const TQString& = TQString() ) { return 0; } /** * @reimplemented from K3bJobHandler */ - bool questionYesNo( const QString&, - const QString& = QString::null, - const QString& = QString::null, - const QString& = QString::null ) { return false; } + bool questionYesNo( const TQString&, + const TQString& = TQString(), + const TQString& = TQString(), + const TQString& = TQString() ) { return false; } /** * reimplemented from K3bJobHandler */ - void blockingInformation( const QString&, - const QString& = QString::null ) {} + void blockingInformation( const TQString&, + const TQString& = TQString() ) {} /** - * \return \see QDialog::exec() + * \return \see TQDialog::exec() */ static int addUrls( const KURL::List& urls, K3bAudioDoc* doc, K3bAudioTrack* afterTrack = 0, - K3bAudioTrack* parentTrack = 0, + K3bAudioTrack* tqparentTrack = 0, K3bAudioDataSource* afterSource = 0, - QWidget* parent = 0 ); + TQWidget* tqparent = 0 ); private slots: void slotAddUrls(); @@ -75,17 +76,17 @@ class K3bAudioTrackAddingDialog : public KDialogBase, public K3bJobHandler void slotCancel(); private: - K3bAudioTrackAddingDialog( QWidget* parent = 0, const char* name = 0 ); + K3bAudioTrackAddingDialog( TQWidget* tqparent = 0, const char* name = 0 ); static KURL::List extractUrlList( const KURL::List& urls ); K3bBusyWidget* m_busyWidget; - QLabel* m_infoLabel; + TQLabel* m_infoLabel; - QStringList m_unreadableFiles; - QStringList m_notFoundFiles; - QStringList m_nonLocalFiles; - QStringList m_unsupportedFiles; + TQStringList m_unreadableFiles; + TQStringList m_notFoundFiles; + TQStringList m_nonLocalFiles; + TQStringList m_unsupportedFiles; KURL::List m_urls; diff --git a/src/projects/k3baudiotrackdialog.cpp b/src/projects/k3baudiotrackdialog.cpp index ecb7796..676e12b 100644 --- a/src/projects/k3baudiotrackdialog.cpp +++ b/src/projects/k3baudiotrackdialog.cpp @@ -14,15 +14,15 @@ */ -#include <qtextedit.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qgroupbox.h> -#include <qframe.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qhbox.h> -#include <qwhatsthis.h> +#include <tqtextedit.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqgroupbox.h> +#include <tqframe.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqhbox.h> +#include <tqwhatsthis.h> #include <kiconloader.h> #include <klocale.h> @@ -54,10 +54,10 @@ // do only show cd-text and options (eventuelle index0) -K3bAudioTrackDialog::K3bAudioTrackDialog( QPtrList<K3bAudioTrack>& tracks, QWidget *parent, const char *name ) +K3bAudioTrackDialog::K3bAudioTrackDialog( TQPtrList<K3bAudioTrack>& tracks, TQWidget *tqparent, const char *name ) : KDialogBase( KDialogBase::Plain, i18n("Audio Track Properties"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Apply, - KDialogBase::Ok, parent, name ) + KDialogBase::Ok, tqparent, name ) { m_tracks = tracks; @@ -86,9 +86,9 @@ void K3bAudioTrackDialog::slotApply() void K3bAudioTrackDialog::setupGui() { - QFrame* frame = plainPage(); + TQFrame* frame = plainPage(); - QGridLayout* mainLayout = new QGridLayout( frame ); + TQGridLayout* mainLayout = new TQGridLayout( frame ); mainLayout->setSpacing( spacingHint() ); mainLayout->setMargin( 0 ); diff --git a/src/projects/k3baudiotrackdialog.h b/src/projects/k3baudiotrackdialog.h index 53edc1c..8eb0ce6 100644 --- a/src/projects/k3baudiotrackdialog.h +++ b/src/projects/k3baudiotrackdialog.h @@ -22,7 +22,7 @@ #include <k3bmsf.h> -#include <qptrlist.h> +#include <tqptrlist.h> class K3bAudioTrack; class K3bAudioTrackWidget; @@ -34,9 +34,10 @@ class K3bAudioTrackWidget; class K3bAudioTrackDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - K3bAudioTrackDialog( QPtrList<K3bAudioTrack>&, QWidget *parent=0, const char *name=0); + K3bAudioTrackDialog( TQPtrList<K3bAudioTrack>&, TQWidget *tqparent=0, const char *name=0); ~K3bAudioTrackDialog(); protected slots: @@ -46,7 +47,7 @@ class K3bAudioTrackDialog : public KDialogBase void updateTrackLengthDisplay(); private: - QPtrList<K3bAudioTrack> m_tracks; + TQPtrList<K3bAudioTrack> m_tracks; K3bAudioTrackWidget* m_audioTrackWidget; diff --git a/src/projects/k3baudiotrackplayer.cpp b/src/projects/k3baudiotrackplayer.cpp index cac2e7a..1175de7 100644 --- a/src/projects/k3baudiotrackplayer.cpp +++ b/src/projects/k3baudiotrackplayer.cpp @@ -21,10 +21,10 @@ #include <kactionclasses.h> #include <klocale.h> -#include <qslider.h> -#include <qtimer.h> -#include <qmutex.h> -#include <qtooltip.h> +#include <tqslider.h> +#include <tqtimer.h> +#include <tqmutex.h> +#include <tqtooltip.h> class K3bAudioTrackPlayer::Private @@ -41,19 +41,19 @@ public: // just to handle them easily; KActionCollection* actionCollection; - QSlider* seekSlider; - QTimer sliderTimer; + TQSlider* seekSlider; + TQTimer sliderTimer; // used to make sure that no seek and read operation occur in parallel - QMutex mutex; + TQMutex mutex; bool playing; bool paused; }; -K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, QObject* parent, const char* name ) - : QObject( parent, name ), +K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ), K3bAudioClient(), m_doc( doc ), m_currentTrack( 0 ) @@ -70,43 +70,43 @@ K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, QObject* parent, con d->actionPlay = new KAction( i18n("Play"), "player_play", KShortcut(), - this, SLOT(playPause()), + this, TQT_SLOT(playPause()), d->actionCollection, "play" ); d->actionPause = new KAction( i18n("Pause"), "player_pause", KShortcut(), - this, SLOT(playPause()), + this, TQT_SLOT(playPause()), d->actionCollection, "pause" ); d->actionPlayPause = new KAction( i18n("Play/Pause"), "player_play", KShortcut(), - this, SLOT(playPause()), + this, TQT_SLOT(playPause()), d->actionCollection, "play_pause" ); d->actionStop = new KAction( i18n("Stop"), "player_stop", KShortcut(), - this, SLOT(stop()), + this, TQT_SLOT(stop()), d->actionCollection, "stop" ); d->actionNext = new KAction( i18n("Next"), "player_end", KShortcut(), - this, SLOT(next()), + this, TQT_SLOT(next()), d->actionCollection, "next" ); d->actionPrev = new KAction( i18n("Prev"), "player_start", KShortcut(), - this, SLOT(prev()), + this, TQT_SLOT(prev()), d->actionCollection, "prev" ); - d->seekSlider = new QSlider( 0, 100, 1, 0, Qt::Horizontal, 0, "audiotrackplayerslider" ); - connect( d->seekSlider, SIGNAL(sliderMoved(int)), this, SLOT(slotSeek(int)) ); + d->seekSlider = new TQSlider( 0, 100, 1, 0, Qt::Horizontal, 0, "audiotrackplayerslider" ); + connect( d->seekSlider, TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(slotSeek(int)) ); // FIXME: maybe it's not such a good idea to use a KWidgetAction here since this way the player // can only be used once in one widget. If the action would always create a new slider we could plug // the action into several toolboxes and also use it in some resizing or track splitting dialogs. @@ -118,7 +118,7 @@ K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, QObject* parent, con d->actionCollection, "seek" ); // this should be done in KWidgetAction but is not yet - connect( d->actionSeek, SIGNAL(enabled(bool)), d->seekSlider, SLOT(setEnabled(bool)) ); + connect( d->actionSeek, TQT_SIGNAL(enabled(bool)), d->seekSlider, TQT_SLOT(setEnabled(bool)) ); d->actionStop->setEnabled(false); d->actionPause->setEnabled(false); @@ -126,18 +126,18 @@ K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, QObject* parent, con d->actionPrev->setEnabled(false); d->actionSeek->setEnabled(false); - connect( m_doc, SIGNAL(changed()), - this, SLOT(slotDocChanged()) ); - connect( m_doc, SIGNAL(trackChanged(K3bAudioTrack*)), - this, SLOT(slotTrackChanged(K3bAudioTrack*)) ); - connect( m_doc, SIGNAL(trackRemoved(K3bAudioTrack*)), - this, SLOT(slotTrackRemoved(K3bAudioTrack*)) ); - connect( &d->sliderTimer, SIGNAL(timeout()), - this, SLOT(slotUpdateSlider()) ); + connect( m_doc, TQT_SIGNAL(changed()), + this, TQT_SLOT(slotDocChanged()) ); + connect( m_doc, TQT_SIGNAL(trackChanged(K3bAudioTrack*)), + this, TQT_SLOT(slotTrackChanged(K3bAudioTrack*)) ); + connect( m_doc, TQT_SIGNAL(trackRemoved(K3bAudioTrack*)), + this, TQT_SLOT(slotTrackRemoved(K3bAudioTrack*)) ); + connect( &d->sliderTimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotUpdateSlider()) ); // we just stop the player if the audio server has an error. K3bMainWindow will show the error message // This is all very hacky and has to be improved for K3b 2.0. But then we will probably use Phonon anyway... - connect( K3bAudioServer::instance(), SIGNAL(error(const QString&)), this, SLOT(stop()) ); + connect( K3bAudioServer::instance(), TQT_SIGNAL(error(const TQString&)), this, TQT_SLOT(stop()) ); // tooltips d->actionPlay->setToolTip( i18n("Play") ); @@ -183,11 +183,11 @@ void K3bAudioTrackPlayer::playTrack( K3bAudioTrack* track ) { if( track ) { // we show the currently playing track as a tooltip on the slider - QToolTip::remove( d->seekSlider ); - QToolTip::add( d->seekSlider, i18n("Playing track %1: %2 - %3") - .arg(track->trackNumber()) - .arg(track->artist()) - .arg(track->title()) ); + TQToolTip::remove( d->seekSlider ); + TQToolTip::add( d->seekSlider, i18n("Playing track %1: %2 - %3") + .tqarg(track->trackNumber()) + .tqarg(track->artist()) + .tqarg(track->title()) ); d->seekSlider->setMaxValue( track->length().totalFrames() ); m_currentTrack = track; d->paused = true; diff --git a/src/projects/k3baudiotrackplayer.h b/src/projects/k3baudiotrackplayer.h index 92f4f0a..7868500 100644 --- a/src/projects/k3baudiotrackplayer.h +++ b/src/projects/k3baudiotrackplayer.h @@ -16,7 +16,7 @@ #ifndef _K3B_AUDIO_TRACK_PLAYER_H_ #define _K3B_AUDIO_TRACK_PLAYER_H_ -#include <qobject.h> +#include <tqobject.h> #include <k3baudioclient.h> @@ -27,12 +27,13 @@ class K3bAudioTrack; class KAction; -class K3bAudioTrackPlayer : public QObject, public K3bAudioClient +class K3bAudioTrackPlayer : public TQObject, public K3bAudioClient { Q_OBJECT + TQ_OBJECT public: - K3bAudioTrackPlayer( K3bAudioDoc* doc, QObject* parent = 0, const char* name = 0 ); + K3bAudioTrackPlayer( K3bAudioDoc* doc, TQObject* tqparent = 0, const char* name = 0 ); ~K3bAudioTrackPlayer(); K3bAudioTrack* currentPlayingTrack() const { return m_currentTrack; } diff --git a/src/projects/k3baudiotracksplitdialog.cpp b/src/projects/k3baudiotracksplitdialog.cpp index 1acd370..9ec443a 100644 --- a/src/projects/k3baudiotracksplitdialog.cpp +++ b/src/projects/k3baudiotracksplitdialog.cpp @@ -25,49 +25,49 @@ #include <kaction.h> #include <kpopupmenu.h> -#include <qlabel.h> -#include <qframe.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqframe.h> +#include <tqlayout.h> -K3bAudioTrackSplitDialog::K3bAudioTrackSplitDialog( K3bAudioTrack* track, QWidget* parent, const char* name ) +K3bAudioTrackSplitDialog::K3bAudioTrackSplitDialog( K3bAudioTrack* track, TQWidget* tqparent, const char* name ) : KDialogBase( KDialogBase::Plain, i18n("Split Audio Track"), KDialogBase::Ok|KDialogBase::Cancel, - KDialogBase::Ok, parent, name ), + KDialogBase::Ok, tqparent, name ), m_track(track) { - QFrame* frame = plainPage(); + TQFrame* frame = plainPage(); m_editorWidget = new K3bAudioEditorWidget( frame ); m_msfEditStart = new K3bMsfEdit( frame ); m_msfEditEnd = new K3bMsfEdit( frame ); - QGridLayout* layout = new QGridLayout( frame ); - layout->setMargin( 0 ); - layout->setSpacing( spacingHint() ); + TQGridLayout* tqlayout = new TQGridLayout( frame ); + tqlayout->setMargin( 0 ); + tqlayout->setSpacing( spacingHint() ); // FIXME: After the string freeze replace the text with a better one explaning how to use this dialog - layout->addMultiCellWidget( new QLabel( i18n("Please select the position where the track should be split."), + tqlayout->addMultiCellWidget( new TQLabel( i18n("Please select the position where the track should be split."), frame ), 0, 0, 0, 3 ); - layout->addMultiCellWidget( m_editorWidget, 1, 1, 0, 3 ); - layout->addWidget( m_msfEditStart, 2, 1 ); - layout->addWidget( new QLabel( " - ", frame ), 2, 2 ); - layout->addWidget( m_msfEditEnd, 2, 3 ); - layout->addWidget( new QLabel( i18n("Split track at:"), frame ), 2, 0 ); - layout->setColStretch( 0, 1 ); + tqlayout->addMultiCellWidget( m_editorWidget, 1, 1, 0, 3 ); + tqlayout->addWidget( m_msfEditStart, 2, 1 ); + tqlayout->addWidget( new TQLabel( " - ", frame ), 2, 2 ); + tqlayout->addWidget( m_msfEditEnd, 2, 3 ); + tqlayout->addWidget( new TQLabel( i18n("Split track at:"), frame ), 2, 0 ); + tqlayout->setColStretch( 0, 1 ); m_editorWidget->setAllowOverlappingRanges( false ); m_editorWidget->enableRangeSelection( true ); m_editorWidget->installEventFilter( this ); - connect( m_editorWidget, SIGNAL(rangeChanged(int, const K3b::Msf&, const K3b::Msf&)), - this, SLOT(slotRangeModified(int, const K3b::Msf&, const K3b::Msf&)) ); - connect( m_editorWidget, SIGNAL(selectedRangeChanged(int)), - this, SLOT(slotRangeSelectionChanged(int)) ); - connect( m_msfEditStart, SIGNAL(valueChanged(const K3b::Msf&)), - this, SLOT(slotMsfEditChanged(const K3b::Msf&)) ); - connect( m_msfEditEnd, SIGNAL(valueChanged(const K3b::Msf&)), - this, SLOT(slotMsfEditChanged(const K3b::Msf&)) ); + connect( m_editorWidget, TQT_SIGNAL(rangeChanged(int, const K3b::Msf&, const K3b::Msf&)), + this, TQT_SLOT(slotRangeModified(int, const K3b::Msf&, const K3b::Msf&)) ); + connect( m_editorWidget, TQT_SIGNAL(selectedRangeChanged(int)), + this, TQT_SLOT(slotRangeSelectionChanged(int)) ); + connect( m_msfEditStart, TQT_SIGNAL(valueChanged(const K3b::Msf&)), + this, TQT_SLOT(slotMsfEditChanged(const K3b::Msf&)) ); + connect( m_msfEditEnd, TQT_SIGNAL(valueChanged(const K3b::Msf&)), + this, TQT_SLOT(slotMsfEditChanged(const K3b::Msf&)) ); setupActions(); @@ -94,11 +94,11 @@ void K3bAudioTrackSplitDialog::setupActions() m_popupMenu = new KPopupMenu( this ); KAction* actionSplitHere = new KAction( i18n("Split Here"), 0, - KShortcut(), this, SLOT(slotSplitHere()), + KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitHere()), actionCollection(), "range_split" ); // FIXME: after the message freeze give this action a proper name like "Remove track part" KAction* actionRemoveRange = new KAction( i18n("Remove this Range"), 0, - KShortcut(), this, SLOT(slotRemoveRange()), + KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotRemoveRange()), actionCollection(), "range_remove" ); actionSplitHere->plug( m_popupMenu ); @@ -148,7 +148,7 @@ void K3bAudioTrackSplitDialog::slotRangeSelectionChanged( int id ) } -void K3bAudioTrackSplitDialog::splitAt( const QPoint& p ) +void K3bAudioTrackSplitDialog::splitAt( const TQPoint& p ) { int id = m_editorWidget->findRange( p.x() ); if( id ) { @@ -160,15 +160,15 @@ void K3bAudioTrackSplitDialog::splitAt( const QPoint& p ) } -bool K3bAudioTrackSplitDialog::eventFilter( QObject* o, QEvent* e ) +bool K3bAudioTrackSplitDialog::eventFilter( TQObject* o, TQEvent* e ) { - if( o == m_editorWidget ) { - if( e->type() == QEvent::MouseButtonDblClick ) { - QMouseEvent* me = static_cast<QMouseEvent*>( e ); + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorWidget) ) { + if( e->type() == TQEvent::MouseButtonDblClick ) { + TQMouseEvent* me = TQT_TQMOUSEEVENT( e ); splitAt( me->pos() ); } - else if( e->type() == QEvent::ContextMenu ) { - QContextMenuEvent* ce = static_cast<QContextMenuEvent*>( e ); + else if( e->type() == TQEvent::ContextMenu ) { + TQContextMenuEvent* ce = TQT_TQCONTEXTMENUEVENT( e ); ce->consume(); m_lastClickPosition = ce->pos(); if( m_editorWidget->findRange( ce->pos().x() ) > 0 ) @@ -193,15 +193,15 @@ void K3bAudioTrackSplitDialog::slotRemoveRange() void K3bAudioTrackSplitDialog::splitTrack( K3bAudioTrack* track, - QWidget* parent, + TQWidget* tqparent, const char* name ) { - K3bAudioTrackSplitDialog d( track, parent, name ); - if( d.exec() == QDialog::Accepted ) { - QValueList<int> ranges = d.m_editorWidget->allRanges(); + K3bAudioTrackSplitDialog d( track, tqparent, name ); + if( d.exec() == TQDialog::Accepted ) { + TQValueList<int> ranges = d.m_editorWidget->allRanges(); // we split the track at all range ends and just delete those that relate to the gaps in between K3b::Msf pos = 0; - for( QValueList<int>::const_iterator it = ranges.constBegin(); + for( TQValueList<int>::const_iterator it = ranges.constBegin(); it != ranges.constEnd(); ++it ) { // delete the unwanted part diff --git a/src/projects/k3baudiotracksplitdialog.h b/src/projects/k3baudiotracksplitdialog.h index c4be91a..ce9b01b 100644 --- a/src/projects/k3baudiotracksplitdialog.h +++ b/src/projects/k3baudiotracksplitdialog.h @@ -34,19 +34,20 @@ class KPopupMenu; class K3bAudioTrackSplitDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - K3bAudioTrackSplitDialog( K3bAudioTrack*, QWidget* parent = 0, const char* name = 0 ); + K3bAudioTrackSplitDialog( K3bAudioTrack*, TQWidget* tqparent = 0, const char* name = 0 ); ~K3bAudioTrackSplitDialog(); - bool eventFilter( QObject* o, QEvent* e ); + bool eventFilter( TQObject* o, TQEvent* e ); KActionCollection* actionCollection() const { return m_actionCollection; } /** * if this method returns true val is filled with the user selected value. */ - static void splitTrack( K3bAudioTrack* track, QWidget* parent = 0, const char* name = 0 ); + static void splitTrack( K3bAudioTrack* track, TQWidget* tqparent = 0, const char* name = 0 ); private slots: void slotRangeModified( int, const K3b::Msf& start, const K3b::Msf& ); @@ -54,7 +55,7 @@ class K3bAudioTrackSplitDialog : public KDialogBase void slotRangeSelectionChanged( int ); void slotSplitHere(); void slotRemoveRange(); - void splitAt( const QPoint& p ); + void splitAt( const TQPoint& p ); private: void setupActions(); @@ -65,7 +66,7 @@ class K3bAudioTrackSplitDialog : public KDialogBase K3bAudioTrack* m_track; KActionCollection* m_actionCollection; KPopupMenu* m_popupMenu; - QPoint m_lastClickPosition; + TQPoint m_lastClickPosition; }; #endif diff --git a/src/projects/k3baudiotracktrmlookupdialog.cpp b/src/projects/k3baudiotracktrmlookupdialog.cpp index b537583..0187d33 100644 --- a/src/projects/k3baudiotracktrmlookupdialog.cpp +++ b/src/projects/k3baudiotracktrmlookupdialog.cpp @@ -32,31 +32,31 @@ #include <kglobal.h> #include <kdebug.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qtimer.h> -#include <qframe.h> -#include <qeventloop.h> -#include <qpushbutton.h> -#include <qapplication.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqtimer.h> +#include <tqframe.h> +#include <tqeventloop.h> +#include <tqpushbutton.h> +#include <tqapplication.h> -K3bAudioTrackTRMLookupDialog::K3bAudioTrackTRMLookupDialog( QWidget* parent, const char* name ) +K3bAudioTrackTRMLookupDialog::K3bAudioTrackTRMLookupDialog( TQWidget* tqparent, const char* name ) : KDialogBase( KDialogBase::Plain, i18n("MusicBrainz Query"), KDialogBase::Cancel, KDialogBase::Cancel, - parent, + tqparent, name, true, true ) { - QGridLayout* grid = new QGridLayout( plainPage() ); + TQGridLayout* grid = new TQGridLayout( plainPage() ); grid->setMargin( marginHint() ); grid->setSpacing( spacingHint() ); - m_infoLabel = new QLabel( plainPage() ); - QLabel* pixLabel = new QLabel( plainPage() ); + m_infoLabel = new TQLabel( plainPage() ); + TQLabel* pixLabel = new TQLabel( plainPage() ); pixLabel->setPixmap( KGlobal::iconLoader()->loadIcon( "musicbrainz", KIcon::NoGroup, 64 ) ); pixLabel->setScaledContents( false ); @@ -68,11 +68,11 @@ K3bAudioTrackTRMLookupDialog::K3bAudioTrackTRMLookupDialog( QWidget* parent, con m_inLoop = false; m_mbJob = new K3bMusicBrainzJob( this ); - connect( m_mbJob, SIGNAL(infoMessage(const QString&, int)), - this, SLOT(slotMbJobInfoMessage(const QString&, int)) ); - connect( m_mbJob, SIGNAL(finished(bool)), this, SLOT(slotMbJobFinished(bool)) ); - connect( m_mbJob, SIGNAL(trackFinished(K3bAudioTrack*, bool)), - this, SLOT(slotTrackFinished(K3bAudioTrack*, bool)) ); + connect( m_mbJob, TQT_SIGNAL(infoMessage(const TQString&, int)), + this, TQT_SLOT(slotMbJobInfoMessage(const TQString&, int)) ); + connect( m_mbJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotMbJobFinished(bool)) ); + connect( m_mbJob, TQT_SIGNAL(trackFinished(K3bAudioTrack*, bool)), + this, TQT_SLOT(slotTrackFinished(K3bAudioTrack*, bool)) ); } @@ -81,7 +81,7 @@ K3bAudioTrackTRMLookupDialog::~K3bAudioTrackTRMLookupDialog() } -int K3bAudioTrackTRMLookupDialog::lookup( const QPtrList<K3bAudioTrack>& tracks ) +int K3bAudioTrackTRMLookupDialog::lookup( const TQPtrList<K3bAudioTrack>& tracks ) { m_mbJob->setTracks( tracks ); m_mbJob->start(); @@ -90,13 +90,13 @@ int K3bAudioTrackTRMLookupDialog::lookup( const QPtrList<K3bAudioTrack>& tracks setModal( true ); show(); m_inLoop = true; - QApplication::eventLoop()->enterLoop(); + TQApplication::eventLoop()->enterLoop(); return 0; } -void K3bAudioTrackTRMLookupDialog::slotMbJobInfoMessage( const QString& message, int ) +void K3bAudioTrackTRMLookupDialog::slotMbJobInfoMessage( const TQString& message, int ) { m_infoLabel->setText( message ); } @@ -107,7 +107,7 @@ void K3bAudioTrackTRMLookupDialog::slotMbJobFinished( bool ) m_busyWidget->showBusy(false); hide(); if( m_inLoop ) - QApplication::eventLoop()->exitLoop(); + TQApplication::eventLoop()->exitLoop(); } @@ -122,7 +122,7 @@ void K3bAudioTrackTRMLookupDialog::slotTrackFinished( K3bAudioTrack* track, bool { if( !success ) K3bPassivePopup::showPopup( i18n("Track %1 was not found in the MusicBrainz database.") - .arg( track->trackNumber()), + .tqarg( track->trackNumber()), i18n("Audio Project") ); } diff --git a/src/projects/k3baudiotracktrmlookupdialog.h b/src/projects/k3baudiotracktrmlookupdialog.h index 10a0f32..f0d6718 100644 --- a/src/projects/k3baudiotracktrmlookupdialog.h +++ b/src/projects/k3baudiotracktrmlookupdialog.h @@ -17,9 +17,9 @@ #define _K3B_AUDIOTRACK_TRM_LOOKUP_DIALOG_H_ #include <kdialogbase.h> -#include <qptrlist.h> +#include <tqptrlist.h> -class QLabel; +class TQLabel; class K3bAudioTrack; class K3bMusicBrainzJob; class K3bBusyWidget; @@ -28,24 +28,25 @@ class K3bBusyWidget; class K3bAudioTrackTRMLookupDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - K3bAudioTrackTRMLookupDialog( QWidget* parent = 0, const char* name = 0 ); + K3bAudioTrackTRMLookupDialog( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bAudioTrackTRMLookupDialog(); /** * This will show the dialog and start the lookup */ - int lookup( const QPtrList<K3bAudioTrack>& tracks ); + int lookup( const TQPtrList<K3bAudioTrack>& tracks ); private slots: void slotMbJobFinished( bool ); - void slotMbJobInfoMessage( const QString&, int ); + void slotMbJobInfoMessage( const TQString&, int ); void slotTrackFinished( K3bAudioTrack* track, bool success ); void slotCancel(); private: - QLabel* m_infoLabel; + TQLabel* m_infoLabel; K3bBusyWidget* m_busyWidget; K3bMusicBrainzJob* m_mbJob; bool m_inLoop; diff --git a/src/projects/k3baudiotrackview.cpp b/src/projects/k3baudiotrackview.cpp index 1af6a5c..9c15061 100644 --- a/src/projects/k3baudiotrackview.cpp +++ b/src/projects/k3baudiotrackview.cpp @@ -37,18 +37,18 @@ #include <k3baudiodecoder.h> #include <k3bmsfedit.h> -#include <qheader.h> -#include <qtimer.h> -#include <qdragobject.h> -#include <qpoint.h> -#include <qptrlist.h> -#include <qstringlist.h> -#include <qevent.h> -#include <qpixmap.h> -#include <qpainter.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qvaluelist.h> +#include <tqheader.h> +#include <tqtimer.h> +#include <tqdragobject.h> +#include <tqpoint.h> +#include <tqptrlist.h> +#include <tqstringlist.h> +#include <tqevent.h> +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqvaluelist.h> #include <kurl.h> #include <kurldrag.h> @@ -61,18 +61,18 @@ #include <kdialogbase.h> -K3bAudioTrackView::K3bAudioTrackView( K3bAudioDoc* doc, QWidget* parent, const char* name ) - : K3bListView( parent, name ), +K3bAudioTrackView::K3bAudioTrackView( K3bAudioDoc* doc, TQWidget* tqparent, const char* name ) + : K3bListView( tqparent, name ), m_doc(doc), m_updatingColumnWidths(false), m_currentMouseOverItem(0), m_currentlyPlayingTrack(0) { - m_player = new K3bAudioTrackPlayer( m_doc, this ); - connect( m_player, SIGNAL(playingTrack(K3bAudioTrack*)), this, - SLOT(showPlayerIndicator(K3bAudioTrack*)) ); - connect( m_player, SIGNAL(paused(bool)), this, SLOT(togglePauseIndicator(bool)) ); - connect( m_player, SIGNAL(stopped()), this, SLOT(removePlayerIndicator()) ); + m_player = new K3bAudioTrackPlayer( m_doc, TQT_TQOBJECT(this) ); + connect( m_player, TQT_SIGNAL(playingTrack(K3bAudioTrack*)), TQT_TQOBJECT(this), + TQT_SLOT(showPlayerIndicator(K3bAudioTrack*)) ); + connect( m_player, TQT_SIGNAL(paused(bool)), TQT_TQOBJECT(this), TQT_SLOT(togglePauseIndicator(bool)) ); + connect( m_player, TQT_SIGNAL(stopped()), TQT_TQOBJECT(this), TQT_SLOT(removePlayerIndicator()) ); setItemMargin( 5 ); setAcceptDrops( true ); @@ -82,7 +82,7 @@ K3bAudioTrackView::K3bAudioTrackView( K3bAudioDoc* doc, QWidget* parent, const c // setSelectionModeExt( KListView::Konqueror ); // FileManager in KDE3 setSelectionModeExt( KListView::Extended ); setItemsMovable( false ); - setAlternateBackground( QColor() ); // disable alternate colors + setAlternateBackground( TQColor() ); // disable alternate colors setNoItemText( i18n("Use drag'n'drop to add audio files to the project.") + "\n" + i18n("After that press the burn button to write the CD." ) ); @@ -90,32 +90,32 @@ K3bAudioTrackView::K3bAudioTrackView( K3bAudioDoc* doc, QWidget* parent, const c setupColumns(); setupActions(); - m_playerItemAnimator = new K3bListViewItemAnimator( this ); + m_playerItemAnimator = new K3bListViewItemAnimator( TQT_TQOBJECT(this) ); - m_animationTimer = new QTimer( this ); - connect( m_animationTimer, SIGNAL(timeout()), this, SLOT(slotAnimation()) ); + m_animationTimer = new TQTimer( this ); + connect( m_animationTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotAnimation()) ); - m_autoOpenTrackTimer = new QTimer( this ); - connect( m_autoOpenTrackTimer, SIGNAL(timeout()), this, SLOT(slotDragTimeout()) ); + m_autoOpenTrackTimer = new TQTimer( this ); + connect( m_autoOpenTrackTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotDragTimeout()) ); - connect( this, SIGNAL(dropped(QDropEvent*, QListViewItem*, QListViewItem*)), - this, SLOT(slotDropped(QDropEvent*, QListViewItem*, QListViewItem*)) ); - connect( this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - this, SLOT(showPopupMenu(KListView*, QListViewItem*, const QPoint&)) ); - connect( this, SIGNAL(doubleClicked(QListViewItem*, const QPoint&, int)), - this, SLOT(slotProperties()) ); + connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), + this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); + connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(showPopupMenu(KListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + this, TQT_SLOT(slotProperties()) ); - connect( doc, SIGNAL(changed()), - this, SLOT(slotChanged()) ); - connect( doc, SIGNAL(trackChanged(K3bAudioTrack*)), - this, SLOT(slotTrackChanged(K3bAudioTrack*)) ); - connect( doc, SIGNAL(trackRemoved(K3bAudioTrack*)), - this, SLOT(slotTrackRemoved(K3bAudioTrack*)) ); + connect( doc, TQT_SIGNAL(changed()), + this, TQT_SLOT(slotChanged()) ); + connect( doc, TQT_SIGNAL(trackChanged(K3bAudioTrack*)), + this, TQT_SLOT(slotTrackChanged(K3bAudioTrack*)) ); + connect( doc, TQT_SIGNAL(trackRemoved(K3bAudioTrack*)), + this, TQT_SLOT(slotTrackRemoved(K3bAudioTrack*)) ); slotChanged(); // a little background pix hack because I am simply incapable of doing it another way. :( -// static QPixmap s_bgPix("/tmp/trueg/audio_bg.png"); +// static TQPixmap s_bgPix("/tmp/trueg/audio_bg.png"); // setK3bBackgroundPixmap( s_bgPix, TOP_LEFT ); } @@ -134,8 +134,8 @@ void K3bAudioTrackView::setupColumns() addColumn( i18n("Length") ); addColumn( i18n("Filename") ); - setColumnAlignment( 3, Qt::AlignHCenter ); - setColumnAlignment( 4, Qt::AlignHCenter ); + setColumnAlignment( 3, TQt::AlignHCenter ); + setColumnAlignment( 4, TQt::AlignHCenter ); setColumnWidthMode( 1, Manual ); setColumnWidthMode( 2, Manual ); @@ -155,61 +155,61 @@ void K3bAudioTrackView::setupActions() m_popupMenu = new KPopupMenu( this ); m_actionProperties = new KAction( i18n("Properties"), "misc", - KShortcut(), this, SLOT(slotProperties()), + KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), actionCollection(), "track_properties" ); m_actionRemove = new KAction( i18n( "Remove" ), "editdelete", - Key_Delete, this, SLOT(slotRemove()), + Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), actionCollection(), "track_remove" ); m_actionAddSilence = new KAction( i18n("Add Silence") + "...", "misc", - KShortcut(), this, SLOT(slotAddSilence()), + KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddSilence()), actionCollection(), "track_add_silence" ); m_actionMergeTracks = new KAction( i18n("Merge Tracks"), "misc", - KShortcut(), this, SLOT(slotMergeTracks()), + KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotMergeTracks()), actionCollection(), "track_merge" ); m_actionSplitSource = new KAction( i18n("Source to Track"), "misc", - KShortcut(), this, SLOT(slotSplitSource()), + KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitSource()), actionCollection(), "source_split" ); m_actionSplitTrack = new KAction( i18n("Split Track..."), 0, - KShortcut(), this, SLOT(slotSplitTrack()), + KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitTrack()), actionCollection(), "track_split" ); m_actionEditSource = new KAction( i18n("Edit Source..."), 0, - KShortcut(), this, SLOT(slotEditSource()), + KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotEditSource()), actionCollection(), "source_edit" ); m_actionPlayTrack = new KAction( i18n("Play Track"), "player_play", - KShortcut(), this, SLOT(slotPlayTrack()), + KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotPlayTrack()), actionCollection(), "track_play" ); #ifdef HAVE_MUSICBRAINZ - KAction* mbAction = new KAction( i18n("Musicbrainz Lookup"), "musicbrainz", 0, this, - SLOT(slotQueryMusicBrainz()), + KAction* mbAction = new KAction( i18n("Musicbrainz Lookup"), "musicbrainz", 0, TQT_TQOBJECT(this), + TQT_SLOT(slotQueryMusicBrainz()), actionCollection(), "project_audio_musicbrainz" ); mbAction->setToolTip( i18n("Try to determine meta information over the internet") ); #endif } -bool K3bAudioTrackView::acceptDrag(QDropEvent* e) const +bool K3bAudioTrackView::acceptDrag(TQDropEvent* e) const { // the first is for built-in item moving, the second for dropping urls, the third for dropping audio tracks return ( KListView::acceptDrag(e) || KURLDrag::canDecode(e) || K3bAudioCdTrackDrag::canDecode(e) ); } -QDragObject* K3bAudioTrackView::dragObject() +TQDragObject* K3bAudioTrackView::dragObject() { - QPtrList<QListViewItem> list = selectedItems(); + TQPtrList<TQListViewItem> list = selectedItems(); if( list.isEmpty() ) return 0; KURL::List urls; - for( QPtrListIterator<QListViewItem> it(list); it.current(); ++it ) { - QListViewItem* item = *it; + for( TQPtrListIterator<TQListViewItem> it(list); it.current(); ++it ) { + TQListViewItem* item = *it; // we simply ignore open track items to not include files twice // we also don't want the invisible source items - QListViewItem* parentItem = K3bListView::parentItem(item); - if( !item->isOpen() && ( !parentItem || parentItem->isOpen() ) ) { + TQListViewItem* tqparentItem = K3bListView::tqparentItem(item); + if( !item->isOpen() && ( !tqparentItem || tqparentItem->isOpen() ) ) { if( K3bAudioDataSourceViewItem* sourceItem = dynamic_cast<K3bAudioDataSourceViewItem*>( item ) ) { if( K3bAudioFile* file = dynamic_cast<K3bAudioFile*>( sourceItem->source() ) ) urls.append( KURL::fromPathOrURL(file->filename()) ); @@ -230,7 +230,7 @@ QDragObject* K3bAudioTrackView::dragObject() } -void K3bAudioTrackView::slotDropped( QDropEvent* e, QListViewItem* parent, QListViewItem* after ) +void K3bAudioTrackView::slotDropped( TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after ) { m_autoOpenTrackTimer->stop(); @@ -249,7 +249,7 @@ void K3bAudioTrackView::slotDropped( QDropEvent* e, QListViewItem* parent, QList } } - if( K3bAudioTrackViewItem* tv = dynamic_cast<K3bAudioTrackViewItem*>( parent ) ) { + if( K3bAudioTrackViewItem* tv = dynamic_cast<K3bAudioTrackViewItem*>( tqparent ) ) { m_dropTrackParent = tv->track(); } @@ -265,22 +265,22 @@ void K3bAudioTrackView::slotDropped( QDropEvent* e, QListViewItem* parent, QList if( e->source() == viewport() ) { - bool copyItems = (e->action() == QDropEvent::Copy); + bool copyItems = (e->action() == TQDropEvent::Copy); // 1. tracks (with some of their sources) -> move complete tracks around // 2. sources (multiple sources) -> move the sources to the destination track // 3. tracks and sources (the latter without their track) -> ignore the latter sources - QPtrList<K3bAudioTrack> tracks; - QPtrList<K3bAudioDataSource> sources; + TQPtrList<K3bAudioTrack> tracks; + TQPtrList<K3bAudioDataSource> sources; getSelectedItems( tracks, sources ); // // remove all sources which belong to one of the selected tracks since they will be // moved along with their tracks // - QPtrListIterator<K3bAudioDataSource> srcIt( sources ); + TQPtrListIterator<K3bAudioDataSource> srcIt( sources ); while( srcIt.current() ) { - if( tracks.containsRef( srcIt.current()->track() ) ) + if( tracks.tqcontainsRef( srcIt.current()->track() ) ) sources.removeRef( *srcIt ); else ++srcIt; @@ -289,7 +289,7 @@ void K3bAudioTrackView::slotDropped( QDropEvent* e, QListViewItem* parent, QList // // Now move (or copy) all the tracks // - for( QPtrListIterator<K3bAudioTrack> it( tracks ); it.current(); ++it ) { + for( TQPtrListIterator<K3bAudioTrack> it( tracks ); it.current(); ++it ) { K3bAudioTrack* track = *it; if( m_dropTrackParent ) { m_dropTrackParent->merge( copyItems ? track->copy() : track, m_dropSourceAfter ); @@ -311,7 +311,7 @@ void K3bAudioTrackView::slotDropped( QDropEvent* e, QListViewItem* parent, QList // // now move (or copy) the sources // - for( QPtrListIterator<K3bAudioDataSource> it( sources ); it.current(); ++it ) { + for( TQPtrListIterator<K3bAudioDataSource> it( sources ); it.current(); ++it ) { K3bAudioDataSource* source = *it; if( m_dropTrackParent ) { if( m_dropSourceAfter ) { @@ -357,12 +357,12 @@ void K3bAudioTrackView::slotDropped( QDropEvent* e, QListViewItem* parent, QList K3bDevice::Toc toc; K3bDevice::Device* dev = 0; K3bCddbResultEntry cddb; - QValueList<int> trackNumbers; + TQValueList<int> trackNumbers; K3bAudioCdTrackDrag::decode( e, toc, trackNumbers, cddb, &dev ); // for now we just create one source - for( QValueList<int>::const_iterator it = trackNumbers.begin(); + for( TQValueList<int>::const_iterator it = trackNumbers.begin(); it != trackNumbers.end(); ++it ) { int trackNumber = *it; @@ -394,7 +394,7 @@ void K3bAudioTrackView::slotDropped( QDropEvent* e, QListViewItem* parent, QList // event queues: the url adding dialog will be non-modal regardless of // the settings in case we open it directly. // - QTimer::singleShot( 0, this, SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddUrls()) ); } } @@ -439,11 +439,11 @@ void K3bAudioTrackView::slotChanged() K3bAudioTrackViewItem* K3bAudioTrackView::getTrackViewItem( K3bAudioTrack* track, bool* isNewItem ) { - QMap<K3bAudioTrack*, K3bAudioTrackViewItem*>::iterator itemIt = m_trackItemMap.find(track); + TQMap<K3bAudioTrack*, K3bAudioTrackViewItem*>::iterator itemIt = m_trackItemMap.tqfind(track); if( itemIt == m_trackItemMap.end() ) { kdDebug() << "(K3bAudioTrackView) new track " << track << endl; K3bAudioTrackViewItem* prevItem = 0; - if( track->prev() && m_trackItemMap.contains( track->prev() ) ) + if( track->prev() && m_trackItemMap.tqcontains( track->prev() ) ) prevItem = m_trackItemMap[track->prev()]; K3bAudioTrackViewItem* newItem = new K3bAudioTrackViewItem( this, prevItem, track ); // @@ -487,11 +487,11 @@ void K3bAudioTrackView::slotTrackChanged( K3bAudioTrack* track ) item->showSources(true); // the length might have changed - item->repaint(); + item->tqrepaint(); // FIXME: only do this if the position really changed // move the item if the position has changed - if( track->prev() && m_trackItemMap.contains(track->prev()) ) + if( track->prev() && m_trackItemMap.tqcontains(track->prev()) ) item->moveItem( m_trackItemMap[track->prev()] ); else if( !track->prev() ) { takeItem( item ); @@ -522,7 +522,7 @@ void K3bAudioTrackView::showAllSources() { // TODO: add an action to show all sources - QListViewItem* item = firstChild(); + TQListViewItem* item = firstChild(); while( item ) { if( K3bAudioTrackViewItem* tv = dynamic_cast<K3bAudioTrackViewItem*>( item ) ) tv->showSources( tv->track()->numberSources() != 1 ); @@ -531,7 +531,7 @@ void K3bAudioTrackView::showAllSources() } -void K3bAudioTrackView::keyPressEvent( QKeyEvent* e ) +void K3bAudioTrackView::keyPressEvent( TQKeyEvent* e ) { // showAllSources(); @@ -539,7 +539,7 @@ void K3bAudioTrackView::keyPressEvent( QKeyEvent* e ) } -void K3bAudioTrackView::keyReleaseEvent( QKeyEvent* e ) +void K3bAudioTrackView::keyReleaseEvent( TQKeyEvent* e ) { // showAllSources(); @@ -547,7 +547,7 @@ void K3bAudioTrackView::keyReleaseEvent( QKeyEvent* e ) } -void K3bAudioTrackView::contentsMouseMoveEvent( QMouseEvent* e ) +void K3bAudioTrackView::contentsMouseMoveEvent( TQMouseEvent* e ) { // showAllSources(); @@ -555,7 +555,7 @@ void K3bAudioTrackView::contentsMouseMoveEvent( QMouseEvent* e ) } -void K3bAudioTrackView::focusOutEvent( QFocusEvent* e ) +void K3bAudioTrackView::focusOutEvent( TQFocusEvent* e ) { // showAllSources(); @@ -563,7 +563,7 @@ void K3bAudioTrackView::focusOutEvent( QFocusEvent* e ) } -void K3bAudioTrackView::resizeEvent( QResizeEvent* e ) +void K3bAudioTrackView::resizeEvent( TQResizeEvent* e ) { K3bListView::resizeEvent(e); @@ -571,7 +571,7 @@ void K3bAudioTrackView::resizeEvent( QResizeEvent* e ) } -void K3bAudioTrackView::contentsDragMoveEvent( QDragMoveEvent* event ) +void K3bAudioTrackView::contentsDragMoveEvent( TQDragMoveEvent* event ) { K3bAudioTrackViewItem* item = findTrackItem( event->pos() ); if( m_currentMouseOverItem != item ) { @@ -585,21 +585,21 @@ void K3bAudioTrackView::contentsDragMoveEvent( QDragMoveEvent* event ) } -void K3bAudioTrackView::contentsDragLeaveEvent( QDragLeaveEvent* e ) +void K3bAudioTrackView::contentsDragLeaveEvent( TQDragLeaveEvent* e ) { m_autoOpenTrackTimer->stop(); K3bListView::contentsDragLeaveEvent( e ); } -K3bAudioTrackViewItem* K3bAudioTrackView::findTrackItem( const QPoint& pos ) const +K3bAudioTrackViewItem* K3bAudioTrackView::findTrackItem( const TQPoint& pos ) const { - QListViewItem* parent = 0; - QListViewItem* after = 0; + TQListViewItem* tqparent = 0; + TQListViewItem* after = 0; K3bAudioTrackView* that = const_cast<K3bAudioTrackView*>(this); - that->findDrop( pos, parent, after ); - if( parent ) - return static_cast<K3bAudioTrackViewItem*>( parent ); + that->findDrop( pos, tqparent, after ); + if( tqparent ) + return static_cast<K3bAudioTrackViewItem*>( tqparent ); else if( K3bAudioTrackViewItem* tv = dynamic_cast<K3bAudioTrackViewItem*>(after) ) return tv; else if( K3bAudioDataSourceViewItem* sv = dynamic_cast<K3bAudioDataSourceViewItem*>(after) ) @@ -628,12 +628,12 @@ void K3bAudioTrackView::resizeColumns() int lengthWidth = header()->fontMetrics().width( header()->label(4) ); int filenameWidth = header()->fontMetrics().width( header()->label(5) ); - for( QListViewItemIterator it( this ); it.current(); ++it ) { - artistWidth = QMAX( artistWidth, it.current()->width( fontMetrics(), this, 1 ) ); - titleWidth = QMAX( titleWidth, it.current()->width( fontMetrics(), this, 2 ) ); - typeWidth = QMAX( typeWidth, it.current()->width( fontMetrics(), this, 3 ) ); - lengthWidth = QMAX( lengthWidth, it.current()->width( fontMetrics(), this, 4 ) ); - filenameWidth = QMAX( filenameWidth, it.current()->width( fontMetrics(), this, 5 ) ); + for( TQListViewItemIterator it( this ); it.current(); ++it ) { + artistWidth = TQMAX( artistWidth, it.current()->width( fontMetrics(), this, 1 ) ); + titleWidth = TQMAX( titleWidth, it.current()->width( fontMetrics(), this, 2 ) ); + typeWidth = TQMAX( typeWidth, it.current()->width( fontMetrics(), this, 3 ) ); + lengthWidth = TQMAX( lengthWidth, it.current()->width( fontMetrics(), this, 4 ) ); + filenameWidth = TQMAX( filenameWidth, it.current()->width( fontMetrics(), this, 5 ) ); } // add a margin @@ -673,7 +673,7 @@ void K3bAudioTrackView::resizeColumns() void K3bAudioTrackView::slotAnimation() { resizeColumns(); - QListViewItem* item = firstChild(); + TQListViewItem* item = firstChild(); bool animate = false; @@ -702,14 +702,14 @@ void K3bAudioTrackView::slotDragTimeout() } -void K3bAudioTrackView::getSelectedItems( QPtrList<K3bAudioTrack>& tracks, - QPtrList<K3bAudioDataSource>& sources ) +void K3bAudioTrackView::getSelectedItems( TQPtrList<K3bAudioTrack>& tracks, + TQPtrList<K3bAudioDataSource>& sources ) { tracks.clear(); sources.clear(); - QPtrList<QListViewItem> items = selectedItems(); - for( QPtrListIterator<QListViewItem> it( items ); it.current(); ++it ) { + TQPtrList<TQListViewItem> items = selectedItems(); + for( TQPtrListIterator<TQListViewItem> it( items ); it.current(); ++it ) { if( K3bAudioTrackViewItem* tv = dynamic_cast<K3bAudioTrackViewItem*>( *it ) ) tracks.append( tv->track() ); else { @@ -725,17 +725,17 @@ void K3bAudioTrackView::getSelectedItems( QPtrList<K3bAudioTrack>& tracks, void K3bAudioTrackView::slotRemove() { - QPtrList<K3bAudioTrack> tracks; - QPtrList<K3bAudioDataSource> sources; + TQPtrList<K3bAudioTrack> tracks; + TQPtrList<K3bAudioDataSource> sources; getSelectedItems( tracks, sources ); // // remove all sources which belong to one of the selected tracks since they will be // deleted along with their tracks // - QPtrListIterator<K3bAudioDataSource> srcIt( sources ); + TQPtrListIterator<K3bAudioDataSource> srcIt( sources ); while( srcIt.current() ) { - if( tracks.containsRef( srcIt.current()->track() ) ) + if( tracks.tqcontainsRef( srcIt.current()->track() ) ) sources.removeRef( *srcIt ); else ++srcIt; @@ -744,20 +744,20 @@ void K3bAudioTrackView::slotRemove() // // Now delete all the tracks // - for( QPtrListIterator<K3bAudioTrack> it( tracks ); it.current(); ++it ) + for( TQPtrListIterator<K3bAudioTrack> it( tracks ); it.current(); ++it ) delete *it; // // Now delete all the sources // - for( QPtrListIterator<K3bAudioDataSource> it( sources ); it.current(); ++it ) + for( TQPtrListIterator<K3bAudioDataSource> it( sources ); it.current(); ++it ) delete *it; } void K3bAudioTrackView::slotAddSilence() { - QListViewItem* item = selectedItems().first(); + TQListViewItem* item = selectedItems().first(); if( item ) { // // create a simple dialog for asking the length of the silence @@ -767,14 +767,14 @@ void K3bAudioTrackView::slotAddSilence() KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, this ); - QHBoxLayout* dlgLayout = new QHBoxLayout( dlg.plainPage(), 0, KDialog::spacingHint() ); + TQHBoxLayout* dlgLayout = new TQHBoxLayout( dlg.plainPage(), 0, KDialog::spacingHint() ); dlgLayout->setAutoAdd( true ); - (void)new QLabel( i18n("Length of silence:"), dlg.plainPage() ); + (void)new TQLabel( i18n("Length of silence:"), dlg.plainPage() ); K3bMsfEdit* msfEdit = new K3bMsfEdit( dlg.plainPage() ); msfEdit->setValue( 150 ); // 2 seconds default msfEdit->setFocus(); - if( dlg.exec() == QDialog::Accepted ) { + if( dlg.exec() == TQDialog::Accepted ) { K3bAudioZeroData* zero = new K3bAudioZeroData( msfEdit->value() ); if( K3bAudioTrackViewItem* tv = dynamic_cast<K3bAudioTrackViewItem*>(item) ) { tv->track()->addSource( zero ); @@ -789,8 +789,8 @@ void K3bAudioTrackView::slotAddSilence() void K3bAudioTrackView::slotMergeTracks() { - QPtrList<K3bAudioTrack> tracks; - QPtrList<K3bAudioDataSource> sources; + TQPtrList<K3bAudioTrack> tracks; + TQPtrList<K3bAudioDataSource> sources; getSelectedItems( tracks, sources ); // we simply merge the selected tracks ignoring any eventually selected sources @@ -805,7 +805,7 @@ void K3bAudioTrackView::slotMergeTracks() void K3bAudioTrackView::slotSplitSource() { - QListViewItem* item = selectedItems().first(); + TQListViewItem* item = selectedItems().first(); if( K3bAudioDataSourceViewItem* sv = dynamic_cast<K3bAudioDataSourceViewItem*>(item) ) { // create a new track K3bAudioTrack* track = new K3bAudioTrack( m_doc ); @@ -830,7 +830,7 @@ void K3bAudioTrackView::slotSplitSource() void K3bAudioTrackView::slotSplitTrack() { - QListViewItem* item = selectedItems().first(); + TQListViewItem* item = selectedItems().first(); if( K3bAudioTrackViewItem* tv = dynamic_cast<K3bAudioTrackViewItem*>(item) ) { K3bAudioTrackSplitDialog::splitTrack( tv->track(), this ); } @@ -839,7 +839,7 @@ void K3bAudioTrackView::slotSplitTrack() void K3bAudioTrackView::slotEditSource() { - QListViewItem* item = selectedItems().first(); + TQListViewItem* item = selectedItems().first(); K3bAudioDataSource* source = 0; if( K3bAudioDataSourceViewItem* sv = dynamic_cast<K3bAudioDataSourceViewItem*>(item) ) @@ -856,22 +856,22 @@ void K3bAudioTrackView::slotEditSource() 0, true, true ); - QVBoxLayout* lay = new QVBoxLayout( dlg.plainPage() ); + TQVBoxLayout* lay = new TQVBoxLayout( dlg.plainPage() ); lay->setMargin( 0 ); lay->setSpacing( KDialog::spacingHint() ); lay->setAutoAdd( true ); K3bAudioDataSourceEditWidget* editW = new K3bAudioDataSourceEditWidget( dlg.plainPage() ); editW->loadSource( source ); - if( dlg.exec() == QDialog::Accepted ) + if( dlg.exec() == TQDialog::Accepted ) editW->saveSource(); } } -void K3bAudioTrackView::showPopupMenu( KListView*, QListViewItem* item, const QPoint& pos ) +void K3bAudioTrackView::showPopupMenu( KListView*, TQListViewItem* item, const TQPoint& pos ) { - QPtrList<K3bAudioTrack> tracks; - QPtrList<K3bAudioDataSource> sources; + TQPtrList<K3bAudioTrack> tracks; + TQPtrList<K3bAudioDataSource> sources; getSelectedItems( tracks, sources ); int numTracks = tracks.count(); @@ -923,8 +923,8 @@ void K3bAudioTrackView::showPopupMenu( KListView*, QListViewItem* item, const QP void K3bAudioTrackView::slotProperties() { - QPtrList<K3bAudioTrack> tracks; - QPtrList<K3bAudioDataSource> sources; + TQPtrList<K3bAudioTrack> tracks; + TQPtrList<K3bAudioDataSource> sources; getSelectedItems( tracks, sources ); // TODO: add tracks from sources to tracks @@ -941,8 +941,8 @@ void K3bAudioTrackView::slotProperties() void K3bAudioTrackView::slotPlayTrack() { - QPtrList<K3bAudioTrack> tracks; - QPtrList<K3bAudioDataSource> sources; + TQPtrList<K3bAudioTrack> tracks; + TQPtrList<K3bAudioDataSource> sources; getSelectedItems( tracks, sources ); if( tracks.count() > 0 ) m_player->playTrack( tracks.first() ); @@ -973,7 +973,7 @@ void K3bAudioTrackView::togglePauseIndicator( bool b ) void K3bAudioTrackView::removePlayerIndicator() { if( m_currentlyPlayingTrack ) - getTrackViewItem( m_currentlyPlayingTrack )->setPixmap( 1, QPixmap() ); + getTrackViewItem( m_currentlyPlayingTrack )->setPixmap( 1, TQPixmap() ); m_playerItemAnimator->stop(); m_currentlyPlayingTrack = 0; } @@ -982,8 +982,8 @@ void K3bAudioTrackView::removePlayerIndicator() void K3bAudioTrackView::slotQueryMusicBrainz() { #ifdef HAVE_MUSICBRAINZ - QPtrList<K3bAudioTrack> tracks; - QPtrList<K3bAudioDataSource> sources; + TQPtrList<K3bAudioTrack> tracks; + TQPtrList<K3bAudioDataSource> sources; getSelectedItems( tracks, sources ); if( tracks.isEmpty() ) { diff --git a/src/projects/k3baudiotrackview.h b/src/projects/k3baudiotrackview.h index 07415b6..fb52509 100644 --- a/src/projects/k3baudiotrackview.h +++ b/src/projects/k3baudiotrackview.h @@ -18,8 +18,8 @@ #include <k3blistview.h> -#include <qmap.h> -#include <qptrlist.h> +#include <tqmap.h> +#include <tqptrlist.h> #include <kurl.h> class K3bAudioTrack; @@ -28,14 +28,14 @@ class K3bAudioDataSource; class K3bAudioDoc; class KActionCollection; class KAction; -class QDropEvent; -class QKeyEvent; -class QFocusEvent; -class QMouseEvent; -class QDragMoveEvent; -class QTimer; +class TQDropEvent; +class TQKeyEvent; +class TQFocusEvent; +class TQMouseEvent; +class TQDragMoveEvent; +class TQTimer; class KPopupMenu; -class QPainter; +class TQPainter; class K3bListViewItemAnimator; class K3bAudioTrackPlayer; @@ -43,17 +43,18 @@ class K3bAudioTrackPlayer; class K3bAudioTrackView : public K3bListView { Q_OBJECT + TQ_OBJECT public: - K3bAudioTrackView( K3bAudioDoc*, QWidget* parent, const char* name = 0 ); + K3bAudioTrackView( K3bAudioDoc*, TQWidget* tqparent, const char* name = 0 ); ~K3bAudioTrackView(); KActionCollection* actionCollection() const { return m_actionCollection; } K3bAudioTrackPlayer* player() const { return m_player; } - void getSelectedItems( QPtrList<K3bAudioTrack>& tracks, - QPtrList<K3bAudioDataSource>& sources ); + void getSelectedItems( TQPtrList<K3bAudioTrack>& tracks, + TQPtrList<K3bAudioDataSource>& sources ); public slots: void showPlayerIndicator( K3bAudioTrack* ); @@ -64,7 +65,7 @@ class K3bAudioTrackView : public K3bListView void setupColumns(); void setupActions(); void showAllSources(); - K3bAudioTrackViewItem* findTrackItem( const QPoint& pos ) const; + K3bAudioTrackViewItem* findTrackItem( const TQPoint& pos ) const; K3bAudioTrackViewItem* getTrackViewItem( K3bAudioTrack* track, bool* isNew = 0 ); K3bAudioDoc* m_doc; @@ -81,11 +82,11 @@ class K3bAudioTrackView : public K3bListView bool m_updatingColumnWidths; - QMap<K3bAudioTrack*, K3bAudioTrackViewItem*> m_trackItemMap; + TQMap<K3bAudioTrack*, K3bAudioTrackViewItem*> m_trackItemMap; K3bAudioTrackViewItem* m_currentMouseOverItem; - QTimer* m_autoOpenTrackTimer; - QTimer* m_animationTimer; + TQTimer* m_autoOpenTrackTimer; + TQTimer* m_animationTimer; KPopupMenu* m_popupMenu; @@ -105,7 +106,7 @@ class K3bAudioTrackView : public K3bListView private slots: void slotAnimation(); - void slotDropped( QDropEvent* e, QListViewItem* parent, QListViewItem* after ); + void slotDropped( TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after ); void slotChanged(); void slotTrackChanged( K3bAudioTrack* ); void slotTrackRemoved( K3bAudioTrack* ); @@ -117,7 +118,7 @@ class K3bAudioTrackView : public K3bListView void slotMergeTracks(); void slotSplitSource(); void slotSplitTrack(); - void showPopupMenu( KListView*, QListViewItem* item, const QPoint& pos ); + void showPopupMenu( KListView*, TQListViewItem* item, const TQPoint& pos ); void slotProperties(); void slotPlayTrack(); void slotQueryMusicBrainz(); @@ -127,16 +128,16 @@ class K3bAudioTrackView : public K3bListView void slotAddUrls(); protected: - void keyPressEvent( QKeyEvent* e ); - void keyReleaseEvent( QKeyEvent* e ); - void focusOutEvent( QFocusEvent* e ); - void contentsMouseMoveEvent( QMouseEvent* e ); - void contentsDragMoveEvent( QDragMoveEvent* e ); - void contentsDragLeaveEvent( QDragLeaveEvent* e ); - void resizeEvent( QResizeEvent* e ); + void keyPressEvent( TQKeyEvent* e ); + void keyReleaseEvent( TQKeyEvent* e ); + void focusOutEvent( TQFocusEvent* e ); + void contentsMouseMoveEvent( TQMouseEvent* e ); + void contentsDragMoveEvent( TQDragMoveEvent* e ); + void contentsDragLeaveEvent( TQDragLeaveEvent* e ); + void resizeEvent( TQResizeEvent* e ); void resizeColumns(); - bool acceptDrag(QDropEvent* e) const; - QDragObject* dragObject(); + bool acceptDrag(TQDropEvent* e) const; + TQDragObject* dragObject(); }; #endif diff --git a/src/projects/k3baudiotrackviewitem.cpp b/src/projects/k3baudiotrackviewitem.cpp index 6918e2a..6c0418f 100644 --- a/src/projects/k3baudiotrackviewitem.cpp +++ b/src/projects/k3baudiotrackviewitem.cpp @@ -22,13 +22,13 @@ #include <kiconloader.h> -#include <qpainter.h> +#include <tqpainter.h> -K3bAudioTrackViewItem::K3bAudioTrackViewItem( K3bAudioTrackView* parent, +K3bAudioTrackViewItem::K3bAudioTrackViewItem( K3bAudioTrackView* tqparent, K3bAudioTrackViewItem* after, K3bAudioTrack* track ) - : K3bListViewItem( parent, after ), + : K3bListViewItem( tqparent, after ), m_track( track ), m_alreadyRemoved(false), m_showingSources(false), @@ -52,12 +52,12 @@ K3bAudioTrackViewItem::K3bAudioTrackViewItem( K3bAudioTrackView* parent, // setMarginVertical( 5 ); // italic type - QFont f(listView()->font()); + TQFont f(listView()->font()); f.setItalic( true ); setFont( 3, f ); // gray out filename - setForegroundColor( 5, listView()->palette().disabled().foreground() ); + setForegroundColor( 5, listView()->tqpalette().disabled().foreground() ); // smaller filename f = listView()->font(); @@ -74,7 +74,7 @@ K3bAudioTrackViewItem::~K3bAudioTrackViewItem() } -void K3bAudioTrackViewItem::paintCell( QPainter* p, const QColorGroup& cg, int col, int width, int align ) +void K3bAudioTrackViewItem::paintCell( TQPainter* p, const TQColorGroup& cg, int col, int width, int align ) { K3bListViewItem::paintCell( p, cg, col, width, align ); @@ -82,25 +82,25 @@ void K3bAudioTrackViewItem::paintCell( QPainter* p, const QColorGroup& cg, int c if( listView()->firstChild() != this ) { p->save(); // FIXME: modify the value from palette().disabled().foreground() to be lighter (or darker, depending on the background color ) - p->setPen( Qt::lightGray ); + p->setPen( TQt::lightGray ); p->drawLine( 0, 0, width, 0 ); p->restore(); } } -void K3bAudioTrackViewItem::paintBranches( QPainter* p, const QColorGroup& cg, int w, int, int h ) +void K3bAudioTrackViewItem::paintBranches( TQPainter* p, const TQColorGroup& cg, int w, int, int h ) { // we just want empty space - p->fillRect( QRect( 0, 0, w, h ), cg.base() ); + p->fillRect( TQRect( 0, 0, w, h ), cg.base() ); } -QString K3bAudioTrackViewItem::text(int i) const +TQString K3bAudioTrackViewItem::text(int i) const { // to avoid crashes when the track has been deleted and this viewitem is still around if( m_alreadyRemoved ) - return QString::null; + return TQString(); // // We add two spaces after all strings (except the once renameable) @@ -110,21 +110,21 @@ QString K3bAudioTrackViewItem::text(int i) const switch( i ) { case 0: - return QString::number( m_track->trackNumber() ).rightJustify( 2, ' ' ); + return TQString::number( m_track->trackNumber() ).rightJustify( 2, ' ' ); case 1: return m_track->performer(); case 2: return m_track->title(); case 3: if( m_showingSources ) - return QString::null; + return TQString(); else return m_track->firstSource()->type(); case 4: return m_track->length().toString(); case 5: if( m_showingSources ) - return QString::null; + return TQString(); else return m_track->firstSource()->sourceComment(); default: @@ -132,10 +132,10 @@ QString K3bAudioTrackViewItem::text(int i) const } } -void K3bAudioTrackViewItem::setText( int col, const QString& text ) +void K3bAudioTrackViewItem::setText( int col, const TQString& text ) { // - // Stupid QListViewItem actually calls setText in paintCell. Thus, once a new item + // Stupid TQListViewItem actually calls setText in paintCell. Thus, once a new item // is created setText is called and in turn the doc is marked as modified since // we call setArtist or setPerformer here! :( // @@ -186,7 +186,7 @@ bool K3bAudioTrackViewItem::animate() // bool animate = false; bool valid = true; - QListViewItem* item = firstChild(); + TQListViewItem* item = firstChild(); while( item ) { K3bAudioDataSourceViewItem* sourceItem = dynamic_cast<K3bAudioDataSourceViewItem*>( item ); animate = animate || sourceItem->animate(); @@ -194,7 +194,7 @@ bool K3bAudioTrackViewItem::animate() item = item->nextSibling(); } if( animate ) { - QString icon = QString( "kde%1" ).arg( m_animationCounter ); + TQString icon = TQString( "kde%1" ).tqarg( m_animationCounter ); setPixmap( 4, SmallIcon( icon ) ); m_animationCounter++; if ( m_animationCounter > 6 ) @@ -213,7 +213,7 @@ void K3bAudioTrackViewItem::setSelected( bool s ) K3bListViewItem::setSelected(s); // we also select or unselect all source items - QListViewItem* item = firstChild(); + TQListViewItem* item = firstChild(); while( item ) { item->setSelected(s); item = item->nextSibling(); @@ -221,7 +221,7 @@ void K3bAudioTrackViewItem::setSelected( bool s ) } -void K3bAudioTrackViewItem::insertItem( QListViewItem* item ) +void K3bAudioTrackViewItem::insertItem( TQListViewItem* item ) { K3bListViewItem::insertItem( item ); if( isSelected() ) diff --git a/src/projects/k3baudiotrackviewitem.h b/src/projects/k3baudiotrackviewitem.h index 9eb6065..c9974ba 100644 --- a/src/projects/k3baudiotrackviewitem.h +++ b/src/projects/k3baudiotrackviewitem.h @@ -25,7 +25,7 @@ class K3bAudioTrack; class K3bAudioTrackViewItem : public K3bListViewItem { public: - K3bAudioTrackViewItem( K3bAudioTrackView* parent, + K3bAudioTrackViewItem( K3bAudioTrackView* tqparent, K3bAudioTrackViewItem* after, K3bAudioTrack* track ); ~K3bAudioTrackViewItem(); @@ -40,8 +40,8 @@ class K3bAudioTrackViewItem : public K3bListViewItem void updateSourceItems(); bool showingSources() const { return m_showingSources; } void showSources( bool show ); - void setText( int col, const QString& text ); - QString text( int i ) const; + void setText( int col, const TQString& text ); + TQString text( int i ) const; /** * @reimpl @@ -50,10 +50,10 @@ class K3bAudioTrackViewItem : public K3bListViewItem /** * @reimpl */ - void insertItem( QListViewItem* item ); + void insertItem( TQListViewItem* item ); - void paintBranches( QPainter*, const QColorGroup &, int, int, int ); - void paintCell( QPainter* p, const QColorGroup& cg, int col, int width, int align ); + void paintBranches( TQPainter*, const TQColorGroup &, int, int, int ); + void paintCell( TQPainter* p, const TQColorGroup& cg, int col, int width, int align ); private: K3bAudioTrack* m_track; diff --git a/src/projects/k3baudiotrackwidget.cpp b/src/projects/k3baudiotrackwidget.cpp index a5a3971..6dc0fe3 100644 --- a/src/projects/k3baudiotrackwidget.cpp +++ b/src/projects/k3baudiotrackwidget.cpp @@ -21,13 +21,13 @@ #include <k3bvalidators.h> #include <k3bcdtextvalidator.h> -#include <qlabel.h> -#include <qcheckbox.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qwidgetstack.h> -#include <qgroupbox.h> -#include <qtabwidget.h> +#include <tqlabel.h> +#include <tqcheckbox.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqwidgetstack.h> +#include <tqgroupbox.h> +#include <tqtabwidget.h> #include <klineedit.h> #include <klocale.h> @@ -35,27 +35,27 @@ -K3bAudioTrackWidget::K3bAudioTrackWidget( const QPtrList<K3bAudioTrack>& tracks, - QWidget* parent, const char* name ) - : base_K3bAudioTrackWidget( parent, name ), +K3bAudioTrackWidget::K3bAudioTrackWidget( const TQPtrList<K3bAudioTrack>& tracks, + TQWidget* tqparent, const char* name ) + : base_K3bAudioTrackWidget( tqparent, name ), m_tracks(tracks) { m_labelPostGap->setBuddy( m_editPostGap ); - QToolTip::add( m_labelPostGap, QToolTip::textFor( m_editPostGap ) ); - QWhatsThis::add( m_labelPostGap, QWhatsThis::textFor( m_editPostGap ) ); + TQToolTip::add( m_labelPostGap, TQToolTip::textFor( m_editPostGap ) ); + TQWhatsThis::add( m_labelPostGap, TQWhatsThis::textFor( m_editPostGap ) ); // no post-gap for the last track m_editPostGap->setDisabled( tracks.count() == 1 && !tracks.getFirst()->next() ); - K3bCdTextValidator* val = new K3bCdTextValidator( this ); + K3bCdTextValidator* val = new K3bCdTextValidator( TQT_TQOBJECT(this) ); m_editSongwriter->setValidator( val ); m_editArranger->setValidator( val ); m_editComposer->setValidator( val ); m_editMessage->setValidator( val ); m_editTitle->setValidator( val ); m_editPerformer->setValidator( val ); - m_editIsrc->setValidator( K3bValidators::isrcValidator( this ) ); + m_editIsrc->setValidator( K3bValidators::isrcValidator( TQT_TQOBJECT(this) ) ); load(); } @@ -92,25 +92,25 @@ void K3bAudioTrackWidget::load() // m_editPostGap->setMsfValue( track->postGap() ); if( track->title() != m_editTitle->text() ) - m_editTitle->setText( QString::null ); + m_editTitle->setText( TQString() ); if( track->artist() != m_editPerformer->text() ) - m_editPerformer->setText( QString::null ); + m_editPerformer->setText( TQString() ); if( track->arranger() != m_editArranger->text() ) - m_editArranger->setText( QString::null ); + m_editArranger->setText( TQString() ); if( track->songwriter() != m_editSongwriter->text() ) - m_editSongwriter->setText( QString::null ); + m_editSongwriter->setText( TQString() ); if( track->composer() != m_editComposer->text() ) - m_editComposer->setText( QString::null ); + m_editComposer->setText( TQString() ); if( track->isrc() != m_editIsrc->text() ) - m_editIsrc->setText( QString::null ); + m_editIsrc->setText( TQString() ); if( track->cdTextMessage() != m_editMessage->text() ) - m_editMessage->setText( QString::null ); + m_editMessage->setText( TQString() ); } if( m_tracks.count() > 1 ) { @@ -149,10 +149,10 @@ void K3bAudioTrackWidget::save() if( m_editMessage->isModified() ) track->setCdTextMessage( m_editMessage->text() ); - if( m_checkCopyPermitted->state() != QButton::NoChange ) + if( m_checkCopyPermitted->state() != TQButton::NoChange ) track->setCopyProtection( !m_checkCopyPermitted->isChecked() ); - if( m_checkPreemphasis->state() != QButton::NoChange ) + if( m_checkPreemphasis->state() != TQButton::NoChange ) track->setPreEmp( m_checkPreemphasis->isChecked() ); track->setIndex0( track->length() - m_editPostGap->msfValue() ); diff --git a/src/projects/k3baudiotrackwidget.h b/src/projects/k3baudiotrackwidget.h index 8f02fbb..bd7124b 100644 --- a/src/projects/k3baudiotrackwidget.h +++ b/src/projects/k3baudiotrackwidget.h @@ -20,7 +20,7 @@ #include <k3bmsf.h> -#include <qptrlist.h> +#include <tqptrlist.h> class K3bAudioTrack; @@ -32,17 +32,19 @@ class K3bAudioTrack; class K3bAudioTrackWidget : public base_K3bAudioTrackWidget { Q_OBJECT + TQ_OBJECT public: - K3bAudioTrackWidget( const QPtrList<K3bAudioTrack>& tracks, - QWidget* parent = 0, const char* name = 0 ); + K3bAudioTrackWidget( const TQPtrList<K3bAudioTrack>& tracks, + TQWidget* tqparent = 0, const char* name = 0 ); ~K3bAudioTrackWidget(); public slots: void save(); void load(); - QPtrList<K3bAudioTrack> m_tracks; + public: + TQPtrList<K3bAudioTrack> m_tracks; }; #endif diff --git a/src/projects/k3baudioview.cpp b/src/projects/k3baudioview.cpp index 3cfe0c0..929907e 100644 --- a/src/projects/k3baudioview.cpp +++ b/src/projects/k3baudioview.cpp @@ -38,8 +38,8 @@ #include <k3bprojectplugin.h> // QT-includes -#include <qlayout.h> -#include <qstring.h> +#include <tqlayout.h> +#include <tqstring.h> // KDE-includes #include <klocale.h> @@ -49,8 +49,8 @@ -K3bAudioView::K3bAudioView( K3bAudioDoc* pDoc, QWidget* parent, const char *name ) - : K3bView( pDoc, parent, name ) +K3bAudioView::K3bAudioView( K3bAudioDoc* pDoc, TQWidget* tqparent, const char *name ) + : K3bView( pDoc, tqparent, name ) { m_doc = pDoc; @@ -59,7 +59,7 @@ K3bAudioView::K3bAudioView( K3bAudioDoc* pDoc, QWidget* parent, const char *name fillStatusDisplay()->showTime(); // add button for the audio conversion - KAction* conversionAction = new KAction( i18n("Convert Tracks"), "redo", 0, this, SLOT(slotAudioConversion()), + KAction* conversionAction = new KAction( i18n("Convert Tracks"), "redo", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAudioConversion()), actionCollection(), "project_audio_convert" ); conversionAction->setToolTip( i18n("Convert audio tracks to other audio formats." ) ); @@ -115,9 +115,9 @@ void K3bAudioView::init() } -K3bProjectBurnDialog* K3bAudioView::newBurnDialog( QWidget* parent, const char* name ) +K3bProjectBurnDialog* K3bAudioView::newBurnDialog( TQWidget* tqparent, const char* name ) { - return new K3bAudioBurnDialog( m_doc, parent, name, true ); + return new K3bAudioBurnDialog( m_doc, tqparent, name, true ); } diff --git a/src/projects/k3baudioview.h b/src/projects/k3baudioview.h index 99740a3..006ee14 100644 --- a/src/projects/k3baudioview.h +++ b/src/projects/k3baudioview.h @@ -20,7 +20,7 @@ #include <k3bview.h> #include "k3baudiotrackview.h" -#include <qstringlist.h> +#include <tqstringlist.h> class K3bAudioDoc; @@ -34,9 +34,10 @@ class K3bAudioTrackView; class K3bAudioView : public K3bView { Q_OBJECT + TQ_OBJECT public: - K3bAudioView( K3bAudioDoc* pDoc, QWidget* parent, const char *name = 0 ); + K3bAudioView( K3bAudioDoc* pDoc, TQWidget* tqparent, const char *name = 0 ); ~K3bAudioView(); K3bAudioTrackPlayer* player() const { return m_songlist->player(); } @@ -45,7 +46,7 @@ class K3bAudioView : public K3bView void addUrls( const KURL::List& ); protected: - K3bProjectBurnDialog* newBurnDialog( QWidget* parent = 0, const char* name = 0 ); + K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); void init(); diff --git a/src/projects/k3bbootimagedialog.cpp b/src/projects/k3bbootimagedialog.cpp index c311082..2cd1a63 100644 --- a/src/projects/k3bbootimagedialog.cpp +++ b/src/projects/k3bbootimagedialog.cpp @@ -21,10 +21,10 @@ K3bBootImageDialog::K3bBootImageDialog( K3bDataDoc* doc, - QWidget* parent, + TQWidget* tqparent, const char* name, bool modal ) - : KDialogBase( parent, name, modal, i18n("Boot Images"), Ok ) + : KDialogBase( tqparent, name, modal, i18n("Boot Images"), Ok ) { m_bootImageView = new K3bBootImageView( doc, this ); setMainWidget( m_bootImageView ); diff --git a/src/projects/k3bbootimagedialog.h b/src/projects/k3bbootimagedialog.h index 161c4b5..6f42849 100644 --- a/src/projects/k3bbootimagedialog.h +++ b/src/projects/k3bbootimagedialog.h @@ -26,10 +26,11 @@ class K3bDataDoc; class K3bBootImageDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: K3bBootImageDialog( K3bDataDoc*, - QWidget* parent = 0, + TQWidget* tqparent = 0, const char* name = 0, bool modal = true ); ~K3bBootImageDialog(); diff --git a/src/projects/k3bbootimageview.cpp b/src/projects/k3bbootimageview.cpp index 22907df..718bc04 100644 --- a/src/projects/k3bbootimageview.cpp +++ b/src/projects/k3bbootimageview.cpp @@ -25,33 +25,33 @@ #include <kdebug.h> #include <kmessagebox.h> -#include <qpushbutton.h> -#include <qstring.h> -#include <qgroupbox.h> -#include <qlineedit.h> -#include <qcheckbox.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> -#include <qregexp.h> +#include <tqpushbutton.h> +#include <tqstring.h> +#include <tqgroupbox.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> +#include <tqregexp.h> class K3bBootImageView::PrivateBootImageViewItem : public KListViewItem { public: - PrivateBootImageViewItem( K3bBootItem* image, QListView* parent ) - : KListViewItem( parent ), + PrivateBootImageViewItem( K3bBootItem* image, TQListView* tqparent ) + : KListViewItem( tqparent ), m_image( image ) { } - PrivateBootImageViewItem( K3bBootItem* image, QListView* parent, QListViewItem* after ) - : KListViewItem( parent, after ), + PrivateBootImageViewItem( K3bBootItem* image, TQListView* tqparent, TQListViewItem* after ) + : KListViewItem( tqparent, after ), m_image( image ) { } - QString text( int col ) const { + TQString text( int col ) const { if( col == 0 ) { if( m_image->imageType() == K3bBootItem::FLOPPY ) return i18n("Floppy"); @@ -61,11 +61,11 @@ public: return i18n("None"); } else if( col == 1 ) - return QString( "%1 KB" ).arg( m_image->size()/1024 ); + return TQString( "%1 KB" ).tqarg( m_image->size()/1024 ); else if( col == 2 ) return m_image->localPath(); else - return QString::null; + return TQString(); } K3bBootItem* bootImage() const { return m_image; } @@ -75,20 +75,20 @@ private: }; -K3bBootImageView::K3bBootImageView( K3bDataDoc* doc, QWidget* parent, const char* name ) - : base_K3bBootImageView( parent, name ), +K3bBootImageView::K3bBootImageView( K3bDataDoc* doc, TQWidget* tqparent, const char* name ) + : base_K3bBootImageView( tqparent, name ), m_doc(doc) { - connect( m_buttonNew, SIGNAL(clicked()), - this, SLOT(slotNewBootImage()) ); - connect( m_buttonDelete, SIGNAL(clicked()), - this, SLOT(slotDeleteBootImage()) ); - connect( m_buttonToggleOptions, SIGNAL(clicked()), - this, SLOT(slotToggleOptions()) ); - connect( m_viewImages, SIGNAL(selectionChanged()), - this, SLOT(slotSelectionChanged()) ); - connect( m_radioNoEmulation, SIGNAL(toggled(bool)), - this, SLOT(slotNoEmulationToggled(bool)) ); + connect( m_buttonNew, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotNewBootImage()) ); + connect( m_buttonDelete, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotDeleteBootImage()) ); + connect( m_buttonToggleOptions, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotToggleOptions()) ); + connect( m_viewImages, TQT_SIGNAL(selectionChanged()), + this, TQT_SLOT(slotSelectionChanged()) ); + connect( m_radioNoEmulation, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotNoEmulationToggled(bool)) ); K3bIntValidator* v = new K3bIntValidator( this ); m_editLoadSegment->setValidator( v ); @@ -126,7 +126,7 @@ void K3bBootImageView::showAdvancedOptions( bool show ) void K3bBootImageView::slotNewBootImage() { - QString file = KFileDialog::getOpenFileName( QString::null, QString::null, this, i18n("Please Choose Boot Image") ); + TQString file = KFileDialog::getOpenFileName( TQString(), TQString(), this, i18n("Please Choose Boot Image") ); if( !file.isEmpty() ) { KIO::filesize_t fsize = K3b::filesize( file ); int boottype = K3bBootItem::FLOPPY; @@ -146,7 +146,7 @@ void K3bBootImageView::slotNewBootImage() i18n("No Floppy image selected"), i18n("Use harddisk emulation"), i18n("Use no emulation"), - QString::null, + TQString(), KMessageBox::AllowLink ) ) { case KMessageBox::Yes: boottype = K3bBootItem::HARDDISK; @@ -167,7 +167,7 @@ void K3bBootImageView::slotNewBootImage() void K3bBootImageView::slotDeleteBootImage() { - QListViewItem* item = m_viewImages->selectedItem(); + TQListViewItem* item = m_viewImages->selectedItem(); if( item ) { K3bBootItem* i = ((PrivateBootImageViewItem*)item)->bootImage(); delete item; @@ -178,7 +178,7 @@ void K3bBootImageView::slotDeleteBootImage() void K3bBootImageView::slotSelectionChanged() { - QListViewItem* item = m_viewImages->selectedItem(); + TQListViewItem* item = m_viewImages->selectedItem(); if( item ) loadBootItemSettings( ((PrivateBootImageViewItem*)item)->bootImage() ); else @@ -189,7 +189,7 @@ void K3bBootImageView::slotSelectionChanged() void K3bBootImageView::updateBootImages() { m_viewImages->clear(); - for( QPtrListIterator<K3bBootItem> it( m_doc->bootImages() ); it.current(); ++it ) { + for( TQPtrListIterator<K3bBootItem> it( m_doc->bootImages() ); it.current(); ++it ) { (void)new PrivateBootImageViewItem( *it, m_viewImages, m_viewImages->lastItem() ); } @@ -207,8 +207,8 @@ void K3bBootImageView::loadBootItemSettings( K3bBootItem* item ) m_checkNoBoot->setChecked( item->noBoot() ); m_checkInfoTable->setChecked( item->bootInfoTable() ); - m_editLoadSegment->setText( "0x" + QString::number( item->loadSegment(), 16 ) ); - m_editLoadSize->setText( "0x" + QString::number( item->loadSize(), 16 ) ); + m_editLoadSegment->setText( "0x" + TQString::number( item->loadSegment(), 16 ) ); + m_editLoadSize->setText( "0x" + TQString::number( item->loadSize(), 16 ) ); if( item->imageType() == K3bBootItem::FLOPPY ) m_radioFloppy->setChecked(true); @@ -235,14 +235,14 @@ void K3bBootImageView::loadBootItemSettings( K3bBootItem* item ) void K3bBootImageView::slotOptionsChanged() { if( !m_loadingItem ) { - QListViewItem* item = m_viewImages->selectedItem(); + TQListViewItem* item = m_viewImages->selectedItem(); if( item ) { K3bBootItem* i = ((PrivateBootImageViewItem*)item)->bootImage(); i->setNoBoot( m_checkNoBoot->isChecked() ); i->setBootInfoTable( m_checkInfoTable->isChecked() ); - // TODO: create some class K3bIntEdit : public QLineEdit + // TODO: create some class K3bIntEdit : public TQLineEdit bool ok = true; i->setLoadSegment( K3bIntValidator::toInt( m_editLoadSegment->text(), &ok ) ); if( !ok ) diff --git a/src/projects/k3bbootimageview.h b/src/projects/k3bbootimageview.h index cf41de1..102cedd 100644 --- a/src/projects/k3bbootimageview.h +++ b/src/projects/k3bbootimageview.h @@ -26,9 +26,10 @@ class K3bBootItem; class K3bBootImageView : public base_K3bBootImageView { Q_OBJECT + TQ_OBJECT public: - K3bBootImageView( K3bDataDoc* doc, QWidget* parent = 0, const char* name = 0 ); + K3bBootImageView( K3bDataDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); ~K3bBootImageView(); private slots: diff --git a/src/projects/k3bdataadvancedimagesettingswidget.cpp b/src/projects/k3bdataadvancedimagesettingswidget.cpp index ac24813..7ce1789 100644 --- a/src/projects/k3bdataadvancedimagesettingswidget.cpp +++ b/src/projects/k3bdataadvancedimagesettingswidget.cpp @@ -17,16 +17,16 @@ #include "k3bisooptions.h" -#include <qcheckbox.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> -#include <qheader.h> -#include <qwhatsthis.h> -#include <qpoint.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qvalidator.h> -#include <qregexp.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> +#include <tqheader.h> +#include <tqwhatsthis.h> +#include <tqpoint.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqvalidator.h> +#include <tqregexp.h> #include <klistview.h> #include <kcombobox.h> @@ -75,17 +75,17 @@ static const char * mkisofsCharacterSets[] = { "cp10081", -class K3bDataAdvancedImageSettingsWidget::PrivateIsoWhatsThis : public QWhatsThis +class K3bDataAdvancedImageSettingsWidget::PrivateIsoWhatsThis : public TQWhatsThis { public: PrivateIsoWhatsThis( K3bDataAdvancedImageSettingsWidget* w ) - : QWhatsThis( w->m_viewIsoSettings->viewport() ) { + : TQWhatsThis( w->m_viewIsoSettings->viewport() ) { this->w = w; } - QString text( const QPoint& p ) { - QListViewItem* i = w->m_viewIsoSettings->selectedItem(); // dies funktioniert nur bei rechtsklick - QListViewItem* i2 = w->m_viewIsoSettings->itemAt( p ); // dies funktioniert nur bei action whatsthis + TQString text( const TQPoint& p ) { + TQListViewItem* i = w->m_viewIsoSettings->selectedItem(); // dies funktioniert nur bei rechtsklick + TQListViewItem* i2 = w->m_viewIsoSettings->itemAt( p ); // dies funktioniert nur bei action whatsthis if( i2 != 0 ) kdDebug() << "at p " << i2->text(0) << endl; @@ -117,21 +117,21 @@ private: -class K3bDataAdvancedImageSettingsWidget::PrivateCheckViewItem : public QCheckListItem +class K3bDataAdvancedImageSettingsWidget::PrivateCheckViewItem : public TQCheckListItem { public: - PrivateCheckViewItem( QListView* parent, const QString& text, Type tt = Controller ) - : QCheckListItem( parent, text, tt ) { + PrivateCheckViewItem( TQListView* tqparent, const TQString& text, Type tt = Controller ) + : TQCheckListItem( tqparent, text, tt ) { } - PrivateCheckViewItem( QListViewItem* parent, const QString& text, Type tt = Controller ) - : QCheckListItem( parent, text, tt ) { + PrivateCheckViewItem( TQListViewItem* tqparent, const TQString& text, Type tt = Controller ) + : TQCheckListItem( tqparent, text, tt ) { } protected: void stateChange( bool on ) { - // enable or disable all children - QListViewItem* item = firstChild(); + // enable or disable all tqchildren + TQListViewItem* item = firstChild(); while( item ) { if( PrivateCheckViewItem* pi = dynamic_cast<PrivateCheckViewItem*>(item) ) pi->setEnabled( !on ); @@ -141,8 +141,8 @@ protected: }; -K3bDataAdvancedImageSettingsWidget::K3bDataAdvancedImageSettingsWidget( QWidget* parent, const char* name ) - : base_K3bAdvancedDataImageSettings( parent, name ) +K3bDataAdvancedImageSettingsWidget::K3bDataAdvancedImageSettingsWidget( TQWidget* tqparent, const char* name ) + : base_K3bAdvancedDataImageSettings( tqparent, name ) { m_viewIsoSettings->header()->hide(); m_viewIsoSettings->setSorting( -1 ); @@ -151,92 +151,92 @@ K3bDataAdvancedImageSettingsWidget::K3bDataAdvancedImageSettingsWidget( QWidget* (void)new PrivateIsoWhatsThis( this ); // create all the view items - QCheckListItem* iso9660Root = new QCheckListItem( m_viewIsoSettings, + TQCheckListItem* iso9660Root = new TQCheckListItem( m_viewIsoSettings, i18n("IS09660 Settings"), - QCheckListItem::Controller ); - QCheckListItem* rrRoot = new QCheckListItem( m_viewIsoSettings, + TQCheckListItem::Controller ); + TQCheckListItem* rrRoot = new TQCheckListItem( m_viewIsoSettings, iso9660Root, i18n("Rock Ridge Settings"), - QCheckListItem::Controller ); - QCheckListItem* jolietRoot = new QCheckListItem( m_viewIsoSettings, + TQCheckListItem::Controller ); + TQCheckListItem* jolietRoot = new TQCheckListItem( m_viewIsoSettings, rrRoot, i18n("Joliet Settings"), - QCheckListItem::Controller ); - QCheckListItem* miscRoot = new QCheckListItem( m_viewIsoSettings, + TQCheckListItem::Controller ); + TQCheckListItem* miscRoot = new TQCheckListItem( m_viewIsoSettings, jolietRoot, i18n("Misc Settings"), - QCheckListItem::Controller ); + TQCheckListItem::Controller ); // ISO9660 settings m_checkAllowUntranslatedFilenames = new PrivateCheckViewItem( iso9660Root, i18n( "Allow untranslated ISO9660 filenames" ), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); m_checkAllowMaxLengthFilenames = new PrivateCheckViewItem( m_checkAllowUntranslatedFilenames, i18n( "Allow max length ISO9660 filenames (37 characters)" ), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); m_checkAllowFullAscii = new PrivateCheckViewItem( m_checkAllowUntranslatedFilenames, i18n( "Allow full ASCII charset for ISO9660 filenames" ), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); m_checkAllowOther = new PrivateCheckViewItem( m_checkAllowUntranslatedFilenames, i18n( "Allow ~ and # in ISO9660 filenames" ), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); m_checkAllowLowercaseCharacters = new PrivateCheckViewItem( m_checkAllowUntranslatedFilenames, i18n( "Allow lowercase characters in ISO9660 filenames" ), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); m_checkAllowMultiDot = new PrivateCheckViewItem( m_checkAllowUntranslatedFilenames, i18n( "Allow multiple dots in ISO9660 filenames" ), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); m_checkAllow31CharFilenames = new PrivateCheckViewItem( m_checkAllowUntranslatedFilenames, i18n( "Allow 31 character ISO9660 filenames" ), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); m_checkAllowBeginningPeriod = new PrivateCheckViewItem( m_checkAllowUntranslatedFilenames, i18n( "Allow leading period in ISO9660 filenames" ), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); m_checkOmitVersionNumbers = new PrivateCheckViewItem( m_checkAllowUntranslatedFilenames, i18n( "Omit version numbers in ISO9660 filenames" ), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); m_checkOmitTrailingPeriod = new PrivateCheckViewItem( m_checkAllowUntranslatedFilenames, i18n( "Omit trailing period in ISO9660 filenames" ), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); m_checkAllowUntranslatedFilenames->setOpen(true); - m_isoLevelController = new QCheckListItem( iso9660Root, + m_isoLevelController = new TQCheckListItem( iso9660Root, m_checkAllowUntranslatedFilenames, i18n("ISO Level") ); - m_radioIsoLevel3 = new QCheckListItem( m_isoLevelController, - i18n("Level %1").arg(3), - QCheckListItem::RadioButton ); - m_radioIsoLevel2 = new QCheckListItem( m_isoLevelController, - i18n("Level %1").arg(2), - QCheckListItem::RadioButton ); - m_radioIsoLevel1 = new QCheckListItem( m_isoLevelController, - i18n("Level %1").arg(1), - QCheckListItem::RadioButton ); + m_radioIsoLevel3 = new TQCheckListItem( m_isoLevelController, + i18n("Level %1").tqarg(3), + TQCheckListItem::RadioButton ); + m_radioIsoLevel2 = new TQCheckListItem( m_isoLevelController, + i18n("Level %1").tqarg(2), + TQCheckListItem::RadioButton ); + m_radioIsoLevel1 = new TQCheckListItem( m_isoLevelController, + i18n("Level %1").tqarg(1), + TQCheckListItem::RadioButton ); m_isoLevelController->setOpen(true); // Joliet Settings - m_checkJolietLong = new QCheckListItem( jolietRoot, + m_checkJolietLong = new TQCheckListItem( jolietRoot, i18n("Allow 103 character Joliet filenames"), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); // Rock Ridge Settings - m_checkCreateTransTbl = new QCheckListItem( rrRoot, + m_checkCreateTransTbl = new TQCheckListItem( rrRoot, i18n( "Create TRANS.TBL files" ), - QCheckListItem::CheckBox ); - m_checkHideTransTbl = new QCheckListItem( rrRoot, m_checkCreateTransTbl, + TQCheckListItem::CheckBox ); + m_checkHideTransTbl = new TQCheckListItem( rrRoot, m_checkCreateTransTbl, i18n( "Hide TRANS.TBL files in Joliet" ), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); // Misc Settings -// m_checkFollowSymbolicLinks = new QCheckListItem( m_viewIsoSettings, +// m_checkFollowSymbolicLinks = new TQCheckListItem( m_viewIsoSettings, // i18n( "Follow symbolic links" ), -// QCheckListItem::CheckBox ); +// TQCheckListItem::CheckBox ); - m_checkDoNotCacheInodes = new QCheckListItem( miscRoot, + m_checkDoNotCacheInodes = new TQCheckListItem( miscRoot, i18n("Do not cache inodes" ), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); iso9660Root->setOpen( true ); jolietRoot->setOpen( true ); @@ -244,14 +244,14 @@ K3bDataAdvancedImageSettingsWidget::K3bDataAdvancedImageSettingsWidget( QWidget* miscRoot->setOpen( true ); - m_comboInputCharset->setValidator( new QRegExpValidator( QRegExp("[\\w_-]*"), this ) ); + m_comboInputCharset->setValidator( new TQRegExpValidator( TQRegExp("[\\w_-]*"), TQT_TQOBJECT(this) ) ); // fill charset combo for( int i = 0; mkisofsCharacterSets[i]; i++ ) { - m_comboInputCharset->insertItem( QString( mkisofsCharacterSets[i] ) ); + m_comboInputCharset->insertItem( TQString( mkisofsCharacterSets[i] ) ); } - connect( m_checkJoliet, SIGNAL(toggled(bool)), this, SLOT(slotJolietToggled(bool)) ); + connect( m_checkJoliet, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotJolietToggled(bool)) ); } diff --git a/src/projects/k3bdataadvancedimagesettingswidget.h b/src/projects/k3bdataadvancedimagesettingswidget.h index eb442e3..9ea8124 100644 --- a/src/projects/k3bdataadvancedimagesettingswidget.h +++ b/src/projects/k3bdataadvancedimagesettingswidget.h @@ -20,15 +20,16 @@ #include "base_k3badvanceddataimagesettings.h" class K3bIsoOptions; -class QCheckListItem; +class TQCheckListItem; class K3bDataAdvancedImageSettingsWidget : public base_K3bAdvancedDataImageSettings { Q_OBJECT + TQ_OBJECT public: - K3bDataAdvancedImageSettingsWidget( QWidget* parent = 0, const char* name = 0 ); + K3bDataAdvancedImageSettingsWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bDataAdvancedImageSettingsWidget(); void load( const K3bIsoOptions& ); @@ -38,26 +39,26 @@ class K3bDataAdvancedImageSettingsWidget : public base_K3bAdvancedDataImageSetti void slotJolietToggled( bool on ); private: - QCheckListItem* m_checkAllowUntranslatedFilenames; - QCheckListItem* m_checkAllowMaxLengthFilenames; - QCheckListItem* m_checkAllowFullAscii; - QCheckListItem* m_checkAllowOther; - QCheckListItem* m_checkAllowLowercaseCharacters; - QCheckListItem* m_checkAllowMultiDot; - QCheckListItem* m_checkOmitVersionNumbers; - QCheckListItem* m_checkOmitTrailingPeriod; - QCheckListItem* m_checkCreateTransTbl; - QCheckListItem* m_checkHideTransTbl; - QCheckListItem* m_checkFollowSymbolicLinks; - QCheckListItem* m_checkAllow31CharFilenames; - QCheckListItem* m_checkAllowBeginningPeriod; - QCheckListItem* m_checkJolietLong; - QCheckListItem* m_checkDoNotCacheInodes; + TQCheckListItem* m_checkAllowUntranslatedFilenames; + TQCheckListItem* m_checkAllowMaxLengthFilenames; + TQCheckListItem* m_checkAllowFullAscii; + TQCheckListItem* m_checkAllowOther; + TQCheckListItem* m_checkAllowLowercaseCharacters; + TQCheckListItem* m_checkAllowMultiDot; + TQCheckListItem* m_checkOmitVersionNumbers; + TQCheckListItem* m_checkOmitTrailingPeriod; + TQCheckListItem* m_checkCreateTransTbl; + TQCheckListItem* m_checkHideTransTbl; + TQCheckListItem* m_checkFollowSymbolicLinks; + TQCheckListItem* m_checkAllow31CharFilenames; + TQCheckListItem* m_checkAllowBeginningPeriod; + TQCheckListItem* m_checkJolietLong; + TQCheckListItem* m_checkDoNotCacheInodes; - QCheckListItem* m_isoLevelController; - QCheckListItem* m_radioIsoLevel1; - QCheckListItem* m_radioIsoLevel2; - QCheckListItem* m_radioIsoLevel3; + TQCheckListItem* m_isoLevelController; + TQCheckListItem* m_radioIsoLevel1; + TQCheckListItem* m_radioIsoLevel2; + TQCheckListItem* m_radioIsoLevel3; class PrivateCheckViewItem; class PrivateIsoWhatsThis; diff --git a/src/projects/k3bdataburndialog.cpp b/src/projects/k3bdataburndialog.cpp index d920fd4..85f6a7d 100644 --- a/src/projects/k3bdataburndialog.cpp +++ b/src/projects/k3bdataburndialog.cpp @@ -32,24 +32,24 @@ #include <k3bglobals.h> #include <k3bwritingmodewidget.h> -#include <qcheckbox.h> -#include <qframe.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qtoolbutton.h> -#include <qlayout.h> -#include <qvariant.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qpoint.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> -#include <qfileinfo.h> -#include <qtabwidget.h> -#include <qspinbox.h> -#include <qfile.h> +#include <tqcheckbox.h> +#include <tqframe.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> +#include <tqtoolbutton.h> +#include <tqlayout.h> +#include <tqvariant.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqpoint.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> +#include <tqfileinfo.h> +#include <tqtabwidget.h> +#include <tqspinbox.h> +#include <tqfile.h> #include <kmessagebox.h> #include <klineedit.h> @@ -64,18 +64,18 @@ #include "k3bfilecompilationsizehandler.h" -K3bDataBurnDialog::K3bDataBurnDialog(K3bDataDoc* _doc, QWidget *parent, const char *name, bool modal ) - : K3bProjectBurnDialog( _doc, parent, name, modal ) +K3bDataBurnDialog::K3bDataBurnDialog(K3bDataDoc* _doc, TQWidget *tqparent, const char *name, bool modal ) + : K3bProjectBurnDialog( _doc, tqparent, name, modal ) { prepareGui(); - setTitle( i18n("Data Project"), i18n("Size: %1").arg( KIO::convertSize(_doc->size()) ) ); + setTitle( i18n("Data Project"), i18n("Size: %1").tqarg( KIO::convertSize(_doc->size()) ) ); // for now we just put the verify checkbox on the main page... m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup ); m_optionGroupLayout->addWidget( m_checkVerify ); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); m_optionGroupLayout->addItem( spacer ); // create image settings tab @@ -84,13 +84,13 @@ K3bDataBurnDialog::K3bDataBurnDialog(K3bDataDoc* _doc, QWidget *parent, const ch setupSettingsTab(); - connect( m_comboMultisession, SIGNAL(activated(int)), - this, SLOT(slotMultiSessionModeChanged()) ); + connect( m_comboMultisession, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotMultiSessionModeChanged()) ); m_writerSelectionWidget->setWantedMediumState( K3bDevice::STATE_EMPTY|K3bDevice::STATE_INCOMPLETE ); m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE ); - QString path = _doc->tempDir(); + TQString path = _doc->tempDir(); if( !path.isEmpty() ) { m_tempDirSelectionWidget->setTempPath( path ); } @@ -98,8 +98,8 @@ K3bDataBurnDialog::K3bDataBurnDialog(K3bDataDoc* _doc, QWidget *parent, const ch m_tempDirSelectionWidget->setDefaultImageFileName( _doc->isoOptions().volumeID() + ".iso" ); } - connect( m_imageSettingsWidget->m_editVolumeName, SIGNAL(textChanged(const QString&)), - m_tempDirSelectionWidget, SLOT(setDefaultImageFileName(const QString&)) ); + connect( m_imageSettingsWidget->m_editVolumeName, TQT_SIGNAL(textChanged(const TQString&)), + m_tempDirSelectionWidget, TQT_SLOT(setDefaultImageFileName(const TQString&)) ); } K3bDataBurnDialog::~K3bDataBurnDialog() @@ -152,15 +152,15 @@ void K3bDataBurnDialog::readSettings() void K3bDataBurnDialog::setupSettingsTab() { - QWidget* frame = new QWidget( this ); - QGridLayout* frameLayout = new QGridLayout( frame ); + TQWidget* frame = new TQWidget( this ); + TQGridLayout* frameLayout = new TQGridLayout( frame ); frameLayout->setSpacing( spacingHint() ); frameLayout->setMargin( marginHint() ); - m_groupDataMode = new QGroupBox( 1, Qt::Vertical, i18n("Datatrack Mode"), frame ); + m_groupDataMode = new TQGroupBox( 1, Qt::Vertical, i18n("Datatrack Mode"), frame ); m_dataModeWidget = new K3bDataModeWidget( m_groupDataMode ); - QGroupBox* groupMultiSession = new QGroupBox( 1, Qt::Vertical, i18n("Multisession Mode"), frame ); + TQGroupBox* groupMultiSession = new TQGroupBox( 1, Qt::Vertical, i18n("Multisession Mode"), frame ); m_comboMultisession = new K3bDataMultiSessionCombobox( groupMultiSession ); frameLayout->addWidget( m_groupDataMode, 0, 0 ); @@ -175,17 +175,17 @@ void K3bDataBurnDialog::slotStartClicked() { if( m_checkOnlyCreateImage->isChecked() || m_checkCacheImage->isChecked() ) { - QFileInfo fi( m_tempDirSelectionWidget->tempPath() ); + TQFileInfo fi( m_tempDirSelectionWidget->tempPath() ); if( fi.isDir() ) m_tempDirSelectionWidget->setTempPath( fi.filePath() + "/image.iso" ); - if( QFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { + if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { if( KMessageBox::warningContinueCancel( this, - i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()), + i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()), i18n("File Exists"), i18n("Overwrite") ) == KMessageBox::Continue ) { // delete the file here to avoid problems with free space in K3bProjectBurnDialog::slotStartClicked - QFile::remove( m_tempDirSelectionWidget->tempPath() ); + TQFile::remove( m_tempDirSelectionWidget->tempPath() ); } else return; diff --git a/src/projects/k3bdataburndialog.h b/src/projects/k3bdataburndialog.h index 1d1e994..4105884 100644 --- a/src/projects/k3bdataburndialog.h +++ b/src/projects/k3bdataburndialog.h @@ -19,13 +19,13 @@ #include "k3bprojectburndialog.h" -class QCheckBox; +class TQCheckBox; class KComboBox; -class QGroupBox; -class QLabel; -class QToolButton; -class QRadioButton; -class QButtonGroup; +class TQGroupBox; +class TQLabel; +class TQToolButton; +class TQRadioButton; +class TQButtonGroup; class K3bWriterSelectionWidget; class K3bTempDirSelectionWidget; class K3bDataDoc; @@ -42,9 +42,10 @@ class K3bDataMultiSessionCombobox; class K3bDataBurnDialog : public K3bProjectBurnDialog { Q_OBJECT + TQ_OBJECT public: - K3bDataBurnDialog(K3bDataDoc*, QWidget *parent=0, const char *name=0, bool modal = true ); + K3bDataBurnDialog(K3bDataDoc*, TQWidget *tqparent=0, const char *name=0, bool modal = true ); ~K3bDataBurnDialog(); protected: @@ -58,11 +59,11 @@ class K3bDataBurnDialog : public K3bProjectBurnDialog K3bDataImageSettingsWidget* m_imageSettingsWidget; // ---------------------------------------------- - QGroupBox* m_groupDataMode; + TQGroupBox* m_groupDataMode; K3bDataModeWidget* m_dataModeWidget; K3bDataMultiSessionCombobox* m_comboMultisession; - QCheckBox* m_checkVerify; + TQCheckBox* m_checkVerify; protected slots: void slotStartClicked(); diff --git a/src/projects/k3bdatadirtreeview.cpp b/src/projects/k3bdatadirtreeview.cpp index 4a7ec18..558e0cf 100644 --- a/src/projects/k3bdatadirtreeview.cpp +++ b/src/projects/k3bdatadirtreeview.cpp @@ -26,9 +26,9 @@ #include <k3bview.h> #include <k3bvalidators.h> -#include <qdragobject.h> -#include <qheader.h> -#include <qtimer.h> +#include <tqdragobject.h> +#include <tqheader.h> +#include <tqtimer.h> #include <klocale.h> #include <kaction.h> @@ -51,21 +51,21 @@ public: K3bDataDirViewItem* animatedDirItem; K3bDataDirViewItem* dropDirItem; int animationCounter; - QPixmap beforeAniPixmap; + TQPixmap beforeAniPixmap; // used for the urladdingdialog hack KURL::List addUrls; K3bDirItem* addParentDir; - QString lastUpdateVolumeId; + TQString lastUpdateVolumeId; - QValidator* iso9660Validator; - QValidator* asciiValidator; + TQValidator* iso9660Validator; + TQValidator* asciiValidator; }; -K3bDataDirTreeView::K3bDataDirTreeView( K3bView* view, K3bDataDoc* doc, QWidget* parent ) - : K3bListView( parent ), m_view(view) +K3bDataDirTreeView::K3bDataDirTreeView( K3bView* view, K3bDataDoc* doc, TQWidget* tqparent ) + : K3bListView( tqparent ), m_view(view) { d = new Private(); @@ -78,7 +78,7 @@ K3bDataDirTreeView::K3bDataDirTreeView( K3bView* view, K3bDataDoc* doc, QWidget* setFullWidth( true ); setDragEnabled( true ); setItemsMovable( false ); - setAlternateBackground( QColor() ); + setAlternateBackground( TQColor() ); // setSorting(-1); addColumn( i18n("Directory") ); @@ -89,15 +89,15 @@ K3bDataDirTreeView::K3bDataDirTreeView( K3bView* view, K3bDataDoc* doc, QWidget* m_root = new K3bDataRootViewItem( doc, this ); m_itemMap.insert( doc->root(), m_root ); - connect( m_doc, SIGNAL(changed()), this, SLOT(slotDocChanged()) ); - connect( this, SIGNAL(clicked(QListViewItem*)), this, SLOT(slotExecuted(QListViewItem*)) ); - connect( this, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(slotExecuted(QListViewItem*)) ); - connect( m_doc, SIGNAL(itemRemoved(K3bDataItem*)), this, SLOT(slotDataItemRemoved(K3bDataItem*)) ); - connect( m_doc, SIGNAL(itemAdded(K3bDataItem*)), this, SLOT(slotItemAdded(K3bDataItem*)) ); - connect( this, SIGNAL(contextMenu(KListView*,QListViewItem*, const QPoint&)), - this, SLOT(showPopupMenu(KListView*,QListViewItem*, const QPoint&)) ); - connect( this, SIGNAL(dropped(QDropEvent*, QListViewItem*, QListViewItem*)), - this, SLOT(slotDropped(QDropEvent*, QListViewItem*, QListViewItem*)) ); + connect( m_doc, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotDocChanged()) ); + connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotExecuted(TQListViewItem*)) ); + connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotExecuted(TQListViewItem*)) ); + connect( m_doc, TQT_SIGNAL(itemRemoved(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotDataItemRemoved(K3bDataItem*)) ); + connect( m_doc, TQT_SIGNAL(itemAdded(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotItemAdded(K3bDataItem*)) ); + connect( this, TQT_SIGNAL(contextMenu(KListView*,TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(showPopupMenu(KListView*,TQListViewItem*, const TQPoint&)) ); + connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), + this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); setupActions(); } @@ -109,20 +109,20 @@ K3bDataDirTreeView::~K3bDataDirTreeView() } -void K3bDataDirTreeView::slotExecuted( QListViewItem* item ) +void K3bDataDirTreeView::slotExecuted( TQListViewItem* item ) { if( K3bDataDirViewItem* viewItem = dynamic_cast<K3bDataDirViewItem*>(item) ) emit dirSelected( viewItem->dirItem() ); } -bool K3bDataDirTreeView::acceptDrag(QDropEvent* e) const{ +bool K3bDataDirTreeView::acceptDrag(TQDropEvent* e) const{ return ( e->source() == viewport() || KURLDrag::canDecode(e) || ( m_fileView && e->source() == m_fileView->viewport() ) ); } -void K3bDataDirTreeView::contentsDragMoveEvent( QDragMoveEvent* e ) +void K3bDataDirTreeView::contentsDragMoveEvent( TQDragMoveEvent* e ) { K3bListView::contentsDragMoveEvent( e ); @@ -138,7 +138,7 @@ void K3bDataDirTreeView::contentsDragMoveEvent( QDragMoveEvent* e ) } -void K3bDataDirTreeView::contentsDragLeaveEvent( QDragLeaveEvent* e ) +void K3bDataDirTreeView::contentsDragLeaveEvent( TQDragLeaveEvent* e ) { K3bListView::contentsDragLeaveEvent( e ); @@ -150,7 +150,7 @@ void K3bDataDirTreeView::contentsDragLeaveEvent( QDragLeaveEvent* e ) } -void K3bDataDirTreeView::slotDropped( QDropEvent* e, QListViewItem*, QListViewItem* ) +void K3bDataDirTreeView::slotDropped( TQDropEvent* e, TQListViewItem*, TQListViewItem* ) { // remove any highlighting if( d->dropDirItem ) { @@ -171,15 +171,15 @@ void K3bDataDirTreeView::slotDropped( QDropEvent* e, QListViewItem*, QListViewIt if( d->addParentDir ) { - // startDropAnimation( parent ); + // startDropAnimation( tqparent ); // check if items have been moved if( m_fileView && e->source() == m_fileView->viewport() ) { // move all selected items - QPtrList<QListViewItem> selectedViewItems = m_fileView->selectedItems(); - QValueList<K3bDataItem*> selectedDataItems; - QPtrListIterator<QListViewItem> it( selectedViewItems ); + TQPtrList<TQListViewItem> selectedViewItems = m_fileView->selectedItems(); + TQValueList<K3bDataItem*> selectedDataItems; + TQPtrListIterator<TQListViewItem> it( selectedViewItems ); for( ; it.current(); ++it ) { K3bDataViewItem* dataViewItem = dynamic_cast<K3bDataViewItem*>( it.current() ); if( dataViewItem ) @@ -188,14 +188,14 @@ void K3bDataDirTreeView::slotDropped( QDropEvent* e, QListViewItem*, QListViewIt kdDebug() << "no dataviewitem" << endl; } - K3bDataUrlAddingDialog::copyMoveItems( selectedDataItems, d->addParentDir, this, e->action() == QDropEvent::Copy ); + K3bDataUrlAddingDialog::copyMoveItems( selectedDataItems, d->addParentDir, this, e->action() == TQDropEvent::Copy ); } else if( e->source() == viewport() ) { // move the selected dir if( K3bDataDirViewItem* dirItem = dynamic_cast<K3bDataDirViewItem*>( selectedItem() ) ) { - QValueList<K3bDataItem*> selectedDataItems; + TQValueList<K3bDataItem*> selectedDataItems; selectedDataItems.append( dirItem->dirItem() ); - K3bDataUrlAddingDialog::copyMoveItems( selectedDataItems, d->addParentDir, this, e->action() == QDropEvent::Copy ); + K3bDataUrlAddingDialog::copyMoveItems( selectedDataItems, d->addParentDir, this, e->action() == TQDropEvent::Copy ); } } else { @@ -207,7 +207,7 @@ void K3bDataDirTreeView::slotDropped( QDropEvent* e, QListViewItem*, QListViewIt // event queues: the url adding dialog will be non-modal regardless of // the settings in case we open it directly. // - QTimer::singleShot( 0, this, SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddUrls()) ); } } } @@ -231,8 +231,8 @@ void K3bDataDirTreeView::slotItemAdded( K3bDataItem* item ) // should only be emitted once for every item // K3bDirItem* dirItem = static_cast<K3bDirItem*>( item ); - K3bDataDirViewItem* parentViewItem = m_itemMap[dirItem->parent()]; - K3bDataDirViewItem* newDirItem = new K3bDataDirViewItem( dirItem, parentViewItem ); + K3bDataDirViewItem* tqparentViewItem = m_itemMap[dirItem->tqparent()]; + K3bDataDirViewItem* newDirItem = new K3bDataDirViewItem( dirItem, tqparentViewItem ); m_itemMap.insert( dirItem, newDirItem ); } } @@ -242,14 +242,14 @@ void K3bDataDirTreeView::slotDataItemRemoved( K3bDataItem* item ) { if( item->isDir() ) { K3bDirItem* dirItem = static_cast<K3bDirItem*>( item ); - QMapIterator<K3bDirItem*, K3bDataDirViewItem*> it = m_itemMap.find( dirItem ); + TQMapIterator<K3bDirItem*, K3bDataDirViewItem*> it = m_itemMap.tqfind( dirItem ); if( it != m_itemMap.end() ) { K3bDataDirViewItem* viewItem = it.data(); m_itemMap.remove( it ); // we don't get removedInfo for the child items // so we need to remove them here - QPtrListIterator<K3bDataItem> it( dirItem->children() ); + TQPtrListIterator<K3bDataItem> it( dirItem->tqchildren() ); for( ; it.current(); ++it ) { if( it.current()->isDir() ) slotDataItemRemoved( it.current() ); @@ -263,12 +263,12 @@ void K3bDataDirTreeView::slotDataItemRemoved( K3bDataItem* item ) void K3bDataDirTreeView::setCurrentDir( K3bDirItem* dirItem ) { - QMapIterator<K3bDirItem*, K3bDataDirViewItem*> it = m_itemMap.find( dirItem ); + TQMapIterator<K3bDirItem*, K3bDataDirViewItem*> it = m_itemMap.tqfind( dirItem ); if( it != m_itemMap.end() ) { setCurrentItem( it.data() ); it.data()->setOpen(true); if( it.data() != root() ) - it.data()->parent()->setOpen(true); + it.data()->tqparent()->setOpen(true); } else { kdDebug() << "Tried to set unknown dirItem to current" << endl; @@ -280,29 +280,29 @@ void K3bDataDirTreeView::setupActions() { m_actionCollection = new KActionCollection( this ); - m_actionProperties = new KAction( i18n("Properties"), "misc", 0, this, SLOT(slotProperties()), + m_actionProperties = new KAction( i18n("Properties"), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), actionCollection(), "properties" ); - m_actionNewDir = new KAction( i18n("New Directory..."), "folder_new", CTRL+Key_N, this, SLOT(slotNewDir()), + m_actionNewDir = new KAction( i18n("New Directory..."), "folder_new", CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotNewDir()), actionCollection(), "new_dir" ); - m_actionRemove = new KAction( i18n("Remove"), "editdelete", Key_Delete, this, SLOT(slotRemoveItem()), + m_actionRemove = new KAction( i18n("Remove"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()), actionCollection(), "remove" ); KShortcut renameShortCut( Key_F2 ); renameShortCut.append( KShortcut(CTRL+Key_R) ); // backwards compatibility - m_actionRename = new KAction( i18n("Rename"), "edit", renameShortCut, this, SLOT(slotRenameItem()), + m_actionRename = new KAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()), actionCollection(), "rename" ); m_popupMenu = new KActionMenu( m_actionCollection, "contextMenu" ); m_popupMenu->insert( m_actionRename ); m_popupMenu->insert( m_actionRemove ); m_popupMenu->insert( m_actionNewDir ); - m_popupMenu->insert( new KActionSeparator( this ) ); + m_popupMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); m_popupMenu->insert( m_actionProperties ); - m_popupMenu->insert( new KActionSeparator( this ) ); + m_popupMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); m_popupMenu->insert( m_view->actionCollection()->action("project_burn") ); } -void K3bDataDirTreeView::showPopupMenu( KListView*, QListViewItem* item, const QPoint& point ) +void K3bDataDirTreeView::showPopupMenu( KListView*, TQListViewItem* item, const TQPoint& point ) { if( item ) { if( K3bDataViewItem* di = dynamic_cast<K3bDataViewItem*>(item) ) { @@ -328,16 +328,16 @@ void K3bDataDirTreeView::showPopupMenu( KListView*, QListViewItem* item, const Q void K3bDataDirTreeView::slotNewDir() { if( K3bDataDirViewItem* vI = dynamic_cast<K3bDataDirViewItem*>(currentItem()) ) { - K3bDirItem* parent = vI->dirItem(); + K3bDirItem* tqparent = vI->dirItem(); - QString name; + TQString name; bool ok; name = KInputDialog::getText( i18n("New Directory"), i18n("Please insert the name for the new directory:"), i18n("New Directory"), &ok, this ); - while( ok && K3bDataDoc::nameAlreadyInDir( name, parent ) ) { + while( ok && K3bDataDoc::nameAlreadyInDir( name, tqparent ) ) { name = KInputDialog::getText( i18n("New Directory"), i18n("A file with that name already exists. " "Please insert the name for the new directory:"), @@ -348,7 +348,7 @@ void K3bDataDirTreeView::slotNewDir() return; - m_doc->addEmptyDir( name, parent ); + m_doc->addEmptyDir( name, tqparent ); } } @@ -374,9 +374,9 @@ void K3bDataDirTreeView::slotProperties() if( viewItem && currentItem() != root() ) { K3bDataPropertiesDialog d( viewItem->dataItem(), this ); if( d.exec() ) { - repaint(); + tqrepaint(); if( m_fileView ) - m_fileView->repaint(); + m_fileView->tqrepaint(); } } else @@ -392,8 +392,8 @@ void K3bDataDirTreeView::startDropAnimation( K3bDirItem* dir ) if( vI ) { d->animationCounter = 0; d->animatedDirItem = vI; - d->beforeAniPixmap = QPixmap( *vI->pixmap(0) ); - QTimer::singleShot( 0, this, SLOT(slotDropAnimate()) ); + d->beforeAniPixmap = TQPixmap( *vI->pixmap(0) ); + TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotDropAnimate()) ); } } @@ -426,7 +426,7 @@ void K3bDataDirTreeView::slotDropAnimate() } d->animationCounter++; - QTimer::singleShot( 300, this, SLOT(slotDropAnimate()) ); + TQTimer::singleShot( 300, TQT_TQOBJECT(this), TQT_SLOT(slotDropAnimate()) ); } } } @@ -448,26 +448,26 @@ void K3bDataDirTreeView::checkForNewItems() while( item != 0 ) { // check if we have an entry and if not, create one - // we can assume that a listViewItem for the parent exists + // we can assume that a listViewItem for the tqparent exists // since we go top to bottom if( item->isDir() ) { K3bDirItem* dirItem = dynamic_cast<K3bDirItem*>( item ); - QMapIterator<K3bDirItem*, K3bDataDirViewItem*> itDirItem = m_itemMap.find( dirItem ); + TQMapIterator<K3bDirItem*, K3bDataDirViewItem*> itDirItem = m_itemMap.tqfind( dirItem ); if( itDirItem == m_itemMap.end() ) { - K3bDataDirViewItem* parentViewItem = m_itemMap[dirItem->parent()]; - K3bDataDirViewItem* newDirItem = new K3bDataDirViewItem( dirItem, parentViewItem ); + K3bDataDirViewItem* tqparentViewItem = m_itemMap[dirItem->tqparent()]; + K3bDataDirViewItem* newDirItem = new K3bDataDirViewItem( dirItem, tqparentViewItem ); m_itemMap.insert( dirItem, newDirItem ); } else { - // check if parent still correct (to get moved items) + // check if tqparent still correct (to get moved items) K3bDataDirViewItem* dirViewItem = itDirItem.data(); - K3bDataDirViewItem* parentViewItem = (K3bDataDirViewItem*)dirViewItem->parent(); - K3bDataDirViewItem* dirParentViewItem = m_itemMap[dirItem->parent()]; - if( dirParentViewItem != parentViewItem ) { + K3bDataDirViewItem* tqparentViewItem = (K3bDataDirViewItem*)dirViewItem->tqparent(); + K3bDataDirViewItem* dirParentViewItem = m_itemMap[dirItem->tqparent()]; + if( dirParentViewItem != tqparentViewItem ) { // reparent it - parentViewItem->takeItem( dirViewItem ); + tqparentViewItem->takeItem( dirViewItem ); dirParentViewItem->insertItem( dirViewItem ); } } @@ -478,7 +478,7 @@ void K3bDataDirTreeView::checkForNewItems() // check the directory depth - QListViewItemIterator it(root()); + TQListViewItemIterator it(root()); while( it.current() != 0 ) { if( K3bDataDirViewItem* dirViewItem = dynamic_cast<K3bDataDirViewItem*>(it.current()) ) if( it.current() != m_root ) { @@ -499,7 +499,7 @@ void K3bDataDirTreeView::slotDocChanged() // avoid flicker if( d->lastUpdateVolumeId != m_doc->isoOptions().volumeID() ) { d->lastUpdateVolumeId = m_doc->isoOptions().volumeID(); - root()->repaint(); + root()->tqrepaint(); } } diff --git a/src/projects/k3bdatadirtreeview.h b/src/projects/k3bdatadirtreeview.h index c79a9c6..2ffaaa7 100644 --- a/src/projects/k3bdatadirtreeview.h +++ b/src/projects/k3bdatadirtreeview.h @@ -21,7 +21,7 @@ #include <k3blistview.h> #include <kurl.h> -#include <qmap.h> +#include <tqmap.h> class K3bDataView; class K3bDataDoc; @@ -33,8 +33,8 @@ class KActionCollection; class KActionMenu; class KAction; class K3bView; -class QDragMoveEvent; -class QDragLeaveEvent; +class TQDragMoveEvent; +class TQDragLeaveEvent; /** @@ -44,9 +44,10 @@ class QDragLeaveEvent; class K3bDataDirTreeView : public K3bListView { Q_OBJECT + TQ_OBJECT public: - K3bDataDirTreeView( K3bView*, K3bDataDoc*, QWidget* parent ); + K3bDataDirTreeView( K3bView*, K3bDataDoc*, TQWidget* tqparent ); virtual ~K3bDataDirTreeView(); K3bDataDirViewItem* root() { return m_root; } @@ -60,13 +61,13 @@ class K3bDataDirTreeView : public K3bListView void setCurrentDir( K3bDirItem* ); signals: - // void urlsDropped( const KURL::List&, QListViewItem* parent ); + // void urlsDropped( const KURL::List&, TQListViewItem* tqparent ); void dirSelected( K3bDirItem* ); protected: - bool acceptDrag(QDropEvent* e) const; - void contentsDragMoveEvent( QDragMoveEvent* e ); - void contentsDragLeaveEvent( QDragLeaveEvent* e ); + bool acceptDrag(TQDropEvent* e) const; + void contentsDragMoveEvent( TQDragMoveEvent* e ); + void contentsDragLeaveEvent( TQDragLeaveEvent* e ); KActionCollection* m_actionCollection; KActionMenu* m_popupMenu; @@ -76,7 +77,7 @@ class K3bDataDirTreeView : public K3bListView KAction* m_actionProperties; protected slots: - virtual void slotDropped( QDropEvent* e, QListViewItem* after, QListViewItem* parent ); + virtual void slotDropped( TQDropEvent* e, TQListViewItem* after, TQListViewItem* tqparent ); private: void setupActions(); @@ -93,15 +94,15 @@ class K3bDataDirTreeView : public K3bListView * We save the dirItems in a map to have a fast way * for checking for new or removed items */ - QMap<K3bDirItem*, K3bDataDirViewItem*> m_itemMap; + TQMap<K3bDirItem*, K3bDataDirViewItem*> m_itemMap; class Private; Private* d; private slots: - void slotExecuted( QListViewItem* ); + void slotExecuted( TQListViewItem* ); void slotDataItemRemoved( K3bDataItem* ); - void showPopupMenu( KListView*, QListViewItem* _item, const QPoint& ); + void showPopupMenu( KListView*, TQListViewItem* _item, const TQPoint& ); void slotRenameItem(); void slotRemoveItem(); void slotNewDir(); diff --git a/src/projects/k3bdatafileview.cpp b/src/projects/k3bdatafileview.cpp index 4c06bde..9030759 100644 --- a/src/projects/k3bdatafileview.cpp +++ b/src/projects/k3bdatafileview.cpp @@ -30,12 +30,12 @@ #include <k3bview.h> -#include <qdragobject.h> -#include <qpainter.h> -#include <qfontmetrics.h> -#include <qtimer.h> -#include <qheader.h> -#include <qfileinfo.h> +#include <tqdragobject.h> +#include <tqpainter.h> +#include <tqfontmetrics.h> +#include <tqtimer.h> +#include <tqheader.h> +#include <tqfileinfo.h> #include <klocale.h> #include <kaction.h> @@ -47,8 +47,8 @@ #include <kdeversion.h> -K3bDataFileView::K3bDataFileView( K3bView* view, K3bDataDirTreeView* dirTreeView, K3bDataDoc* doc, QWidget* parent ) - : K3bListView( parent ), +K3bDataFileView::K3bDataFileView( K3bView* view, K3bDataDirTreeView* dirTreeView, K3bDataDoc* doc, TQWidget* tqparent ) + : K3bListView( tqparent ), m_view(view), m_dropDirItem(0) { @@ -79,16 +79,16 @@ K3bDataFileView::K3bDataFileView( K3bView* view, K3bDataDirTreeView* dirTreeView m_currentDir = doc->root(); checkForNewItems(); - connect( m_treeView, SIGNAL(dirSelected(K3bDirItem*)), this, SLOT(slotSetCurrentDir(K3bDirItem*)) ); - connect( m_doc, SIGNAL(itemRemoved(K3bDataItem*)), this, SLOT(slotDataItemRemoved(K3bDataItem*)) ); - connect( m_doc, SIGNAL(itemAdded(K3bDataItem*)), this, SLOT(slotItemAdded(K3bDataItem*)) ); - connect( this, SIGNAL(executed(QListViewItem*)), this, SLOT(slotExecuted(QListViewItem*)) ); - connect( this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - this, SLOT(showPopupMenu(KListView*, QListViewItem*, const QPoint&)) ); - connect( this, SIGNAL(dropped(QDropEvent*, QListViewItem*, QListViewItem*)), - this, SLOT(slotDropped(QDropEvent*, QListViewItem*, QListViewItem*)) ); - connect( this, SIGNAL(doubleClicked(QListViewItem*, const QPoint&, int)), - this, SLOT(slotDoubleClicked(QListViewItem*)) ); + connect( m_treeView, TQT_SIGNAL(dirSelected(K3bDirItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotSetCurrentDir(K3bDirItem*)) ); + connect( m_doc, TQT_SIGNAL(itemRemoved(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotDataItemRemoved(K3bDataItem*)) ); + connect( m_doc, TQT_SIGNAL(itemAdded(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotItemAdded(K3bDataItem*)) ); + connect( this, TQT_SIGNAL(executed(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotExecuted(TQListViewItem*)) ); + connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(showPopupMenu(KListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), + this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); + connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + this, TQT_SLOT(slotDoubleClicked(TQListViewItem*)) ); setupActions(); } @@ -126,7 +126,7 @@ void K3bDataFileView::clearItems() void K3bDataFileView::slotItemAdded( K3bDataItem* item ) { - if( item->parent() == currentDir() ) { + if( item->tqparent() == currentDir() ) { K3bDataViewItem* vi = 0; if( item->isDir() ) vi = new K3bDataDirViewItem( static_cast<K3bDirItem*>(item), this ); @@ -153,7 +153,7 @@ void K3bDataFileView::slotDataItemRemoved( K3bDataItem* item ) } } - if( m_itemMap.contains( item ) ) { + if( m_itemMap.tqcontains( item ) ) { delete m_itemMap[item]; m_itemMap.remove(item); } @@ -165,26 +165,26 @@ void K3bDataFileView::checkForNewItems() hideEditor(); // add items that are not there yet - for( QPtrListIterator<K3bDataItem> it( m_currentDir->children() ); it.current(); ++it ) { - if( !m_itemMap.contains( it.current() ) ) { + for( TQPtrListIterator<K3bDataItem> it( m_currentDir->tqchildren() ); it.current(); ++it ) { + if( !m_itemMap.tqcontains( it.current() ) ) { slotItemAdded( it.current() ); } } // now check if some of the items have been moved out of the currently showing dir. - for( QListViewItemIterator it( this ); it.current(); ++it ) { + for( TQListViewItemIterator it( this ); it.current(); ++it ) { K3bDataViewItem* dataViewItem = dynamic_cast<K3bDataViewItem*>( it.current() ); - if( dataViewItem && dataViewItem->dataItem()->parent() != currentDir() ) + if( dataViewItem && dataViewItem->dataItem()->tqparent() != currentDir() ) delete dataViewItem; } } -QDragObject* K3bDataFileView::dragObject() +TQDragObject* K3bDataFileView::dragObject() { - QPtrList<QListViewItem> selectedViewItems = selectedItems(); + TQPtrList<TQListViewItem> selectedViewItems = selectedItems(); KURL::List urls; - for( QPtrListIterator<QListViewItem> it( selectedViewItems ); it.current(); ++it ) { + for( TQPtrListIterator<TQListViewItem> it( selectedViewItems ); it.current(); ++it ) { K3bDataViewItem* dataViewItem = dynamic_cast<K3bDataViewItem*>( it.current() ); if( dataViewItem ) { urls.append( KURL::fromPathOrURL(dataViewItem->dataItem()->localPath()) ); @@ -200,7 +200,7 @@ QDragObject* K3bDataFileView::dragObject() } -bool K3bDataFileView::acceptDrag(QDropEvent* e) const +bool K3bDataFileView::acceptDrag(TQDropEvent* e) const { return ( e->source() == viewport() || KURLDrag::canDecode(e) || @@ -208,7 +208,7 @@ bool K3bDataFileView::acceptDrag(QDropEvent* e) const } -void K3bDataFileView::contentsDragMoveEvent( QDragMoveEvent* e ) +void K3bDataFileView::contentsDragMoveEvent( TQDragMoveEvent* e ) { K3bListView::contentsDragMoveEvent( e ); @@ -222,7 +222,7 @@ void K3bDataFileView::contentsDragMoveEvent( QDragMoveEvent* e ) } -void K3bDataFileView::contentsDragLeaveEvent( QDragLeaveEvent* e ) +void K3bDataFileView::contentsDragLeaveEvent( TQDragLeaveEvent* e ) { K3bListView::contentsDragLeaveEvent( e ); @@ -234,7 +234,7 @@ void K3bDataFileView::contentsDragLeaveEvent( QDragLeaveEvent* e ) } -void K3bDataFileView::slotDropped( QDropEvent* e, QListViewItem*, QListViewItem* ) +void K3bDataFileView::slotDropped( TQDropEvent* e, TQListViewItem*, TQListViewItem* ) { // remove any highlighting if( m_dropDirItem ) { @@ -259,9 +259,9 @@ void K3bDataFileView::slotDropped( QDropEvent* e, QListViewItem*, QListViewItem* // check if items have been moved if( e->source() == viewport() ) { // move all selected items - QPtrList<QListViewItem> selectedViewItems = selectedItems(); - QValueList<K3bDataItem*> selectedDataItems; - QPtrListIterator<QListViewItem> it( selectedViewItems ); + TQPtrList<TQListViewItem> selectedViewItems = selectedItems(); + TQValueList<K3bDataItem*> selectedDataItems; + TQPtrListIterator<TQListViewItem> it( selectedViewItems ); for( ; it.current(); ++it ) { K3bDataViewItem* dataViewItem = dynamic_cast<K3bDataViewItem*>( it.current() ); if( dataViewItem ) @@ -270,14 +270,14 @@ void K3bDataFileView::slotDropped( QDropEvent* e, QListViewItem*, QListViewItem* kdDebug() << "no dataviewitem" << endl; } - K3bDataUrlAddingDialog::copyMoveItems( selectedDataItems, m_addParentDir, this, e->action() == QDropEvent::Copy ); + K3bDataUrlAddingDialog::copyMoveItems( selectedDataItems, m_addParentDir, this, e->action() == TQDropEvent::Copy ); } else if( e->source() == m_treeView->viewport() ) { // move the selected dir if( K3bDataDirViewItem* dirItem = dynamic_cast<K3bDataDirViewItem*>( m_treeView->selectedItem() ) ) { - QValueList<K3bDataItem*> selectedDataItems; + TQValueList<K3bDataItem*> selectedDataItems; selectedDataItems.append( dirItem->dirItem() ); - K3bDataUrlAddingDialog::copyMoveItems( selectedDataItems, m_addParentDir, this, e->action() == QDropEvent::Copy ); + K3bDataUrlAddingDialog::copyMoveItems( selectedDataItems, m_addParentDir, this, e->action() == TQDropEvent::Copy ); } } else { @@ -289,7 +289,7 @@ void K3bDataFileView::slotDropped( QDropEvent* e, QListViewItem*, QListViewItem* // event queues: the url adding dialog will be non-modal regardless of // the settings in case we open it directly. // - QTimer::singleShot( 0, this, SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddUrls()) ); } } } @@ -305,7 +305,7 @@ void K3bDataFileView::slotAddUrls() } -void K3bDataFileView::slotExecuted( QListViewItem* item ) +void K3bDataFileView::slotExecuted( TQListViewItem* item ) { if( K3bDataDirViewItem* k = dynamic_cast<K3bDataDirViewItem*>( item ) ) { hideEditor(); // disable the K3bListView Editor @@ -319,37 +319,37 @@ void K3bDataFileView::setupActions() { m_actionCollection = new KActionCollection( this ); - m_actionProperties = new KAction( i18n("Properties"), "misc", 0, this, SLOT(slotProperties()), + m_actionProperties = new KAction( i18n("Properties"), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), actionCollection(), "properties" ); - m_actionNewDir = new KAction( i18n("New Directory..."), "folder_new", CTRL+Key_N, this, SLOT(slotNewDir()), + m_actionNewDir = new KAction( i18n("New Directory..."), "folder_new", CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotNewDir()), actionCollection(), "new_dir" ); - m_actionRemove = new KAction( i18n("Remove"), "editdelete", Key_Delete, this, SLOT(slotRemoveItem()), + m_actionRemove = new KAction( i18n("Remove"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()), actionCollection(), "remove" ); KShortcut renameShortCut( Key_F2 ); renameShortCut.append( KShortcut(CTRL+Key_R) ); // backwards compatibility - m_actionRename = new KAction( i18n("Rename"), "edit", renameShortCut, this, SLOT(slotRenameItem()), + m_actionRename = new KAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()), actionCollection(), "rename" ); - m_actionParentDir = new KAction( i18n("Parent Directory"), "up", 0, this, SLOT(slotParentDir()), - actionCollection(), "parent_dir" ); - m_actionOpen = new KAction( i18n("Open"), "fileopen", 0, this, SLOT(slotOpen()), + m_actionParentDir = new KAction( i18n("Parent Directory"), "up", 0, TQT_TQOBJECT(this), TQT_SLOT(slotParentDir()), + actionCollection(), "tqparent_dir" ); + m_actionOpen = new KAction( i18n("Open"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpen()), actionCollection(), "open" ); m_popupMenu = new KActionMenu( m_actionCollection, "contextMenu" ); m_popupMenu->insert( m_actionParentDir ); - m_popupMenu->insert( new KActionSeparator( this ) ); + m_popupMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); m_popupMenu->insert( m_actionRename ); m_popupMenu->insert( m_actionRemove ); m_popupMenu->insert( m_actionNewDir ); - m_popupMenu->insert( new KActionSeparator( this ) ); + m_popupMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); m_popupMenu->insert( m_actionOpen ); - m_popupMenu->insert( new KActionSeparator( this ) ); + m_popupMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); m_popupMenu->insert( m_actionProperties ); - m_popupMenu->insert( new KActionSeparator( this ) ); + m_popupMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); m_popupMenu->insert( m_view->actionCollection()->action("project_burn") ); } -void K3bDataFileView::showPopupMenu( KListView*, QListViewItem* item, const QPoint& point ) +void K3bDataFileView::showPopupMenu( KListView*, TQListViewItem* item, const TQPoint& point ) { if( item ) { K3bDataItem* di = static_cast<K3bDataViewItem*>(item)->dataItem(); @@ -373,16 +373,16 @@ void K3bDataFileView::showPopupMenu( KListView*, QListViewItem* item, const QPoi void K3bDataFileView::slotNewDir() { - K3bDirItem* parent = currentDir(); + K3bDirItem* tqparent = currentDir(); - QString name; + TQString name; bool ok; name = KInputDialog::getText( i18n("New Directory"), i18n("Please insert the name for the new directory:"), i18n("New Directory"), &ok, this ); - while( ok && K3bDataDoc::nameAlreadyInDir( name, parent ) ) { + while( ok && K3bDataDoc::nameAlreadyInDir( name, tqparent ) ) { name = KInputDialog::getText( i18n("New Directory"), i18n("A file with that name already exists. " "Please insert the name for the new directory:"), @@ -393,7 +393,7 @@ void K3bDataFileView::slotNewDir() return; - m_doc->addEmptyDir( name, parent ); + m_doc->addEmptyDir( name, tqparent ); } @@ -406,8 +406,8 @@ void K3bDataFileView::slotRenameItem() void K3bDataFileView::slotRemoveItem() { - QPtrList<QListViewItem> items = selectedItems(); - QPtrListIterator<QListViewItem> it( items ); + TQPtrList<TQListViewItem> items = selectedItems(); + TQPtrListIterator<TQListViewItem> it( items ); for(; it.current(); ++it ) { if( K3bDataViewItem* d = dynamic_cast<K3bDataViewItem*>( it.current() ) ) m_doc->removeItem( d->dataItem() ); @@ -418,7 +418,7 @@ void K3bDataFileView::slotRemoveItem() void K3bDataFileView::slotParentDir() { if( currentDir() != m_doc->root() ) { - slotSetCurrentDir( currentDir()->parent() ); + slotSetCurrentDir( currentDir()->tqparent() ); emit dirSelected( currentDir() ); } @@ -458,7 +458,7 @@ void K3bDataFileView::slotOpen() !KRun::isExecutableFile( KURL::fromPathOrURL(item->localPath()), fvi->mimeType()->name() ) #else - !QFileInfo( item->localPath() ).isExecutable() + !TQFileInfo( item->localPath() ).isExecutable() #endif ) KRun::runURL( KURL::fromPathOrURL(item->localPath()), @@ -470,7 +470,7 @@ void K3bDataFileView::slotOpen() } -void K3bDataFileView::slotDoubleClicked( QListViewItem* ) +void K3bDataFileView::slotDoubleClicked( TQListViewItem* ) { if( K3bDataViewItem* viewItem = dynamic_cast<K3bDataViewItem*>( selectedItems().first() ) ) { if( !viewItem->dataItem()->isDir() ) { diff --git a/src/projects/k3bdatafileview.h b/src/projects/k3bdatafileview.h index 580af96..cd7e2c8 100644 --- a/src/projects/k3bdatafileview.h +++ b/src/projects/k3bdatafileview.h @@ -21,7 +21,7 @@ #include <kurl.h> -#include <qmap.h> +#include <tqmap.h> class K3bDataDoc; @@ -29,16 +29,16 @@ class K3bDirItem; class K3bDataView; class K3bDataViewItem; class K3bDataItem; -class QDropEvent; +class TQDropEvent; class KActionCollection; class KActionMenu; class KAction; class K3bDataDirTreeView; class K3bDataDirViewItem; class K3bView; -class QPainter; -class QDragMoveEvent; -class QDragLeaveEvent; +class TQPainter; +class TQDragMoveEvent; +class TQDragLeaveEvent; /** *@author Sebastian Trueg @@ -47,9 +47,10 @@ class QDragLeaveEvent; class K3bDataFileView : public K3bListView { Q_OBJECT + TQ_OBJECT public: - K3bDataFileView( K3bView*, K3bDataDirTreeView*, K3bDataDoc*, QWidget* parent ); + K3bDataFileView( K3bView*, K3bDataDirTreeView*, K3bDataDoc*, TQWidget* tqparent ); ~K3bDataFileView(); K3bDirItem* currentDir() const; @@ -65,24 +66,24 @@ class K3bDataFileView : public K3bListView private slots: void slotDataItemRemoved( K3bDataItem* ); - void slotExecuted( QListViewItem* ); - void slotDropped( QDropEvent* e, QListViewItem* after, QListViewItem* parent ); - void showPopupMenu( KListView*, QListViewItem* _item, const QPoint& ); + void slotExecuted( TQListViewItem* ); + void slotDropped( TQDropEvent* e, TQListViewItem* after, TQListViewItem* tqparent ); + void showPopupMenu( KListView*, TQListViewItem* _item, const TQPoint& ); void slotRenameItem(); void slotRemoveItem(); void slotNewDir(); void slotParentDir(); void slotProperties(); - void slotDoubleClicked( QListViewItem* item ); + void slotDoubleClicked( TQListViewItem* item ); void slotItemAdded( K3bDataItem* ); void slotAddUrls(); void slotOpen(); protected: - bool acceptDrag(QDropEvent* e) const; - void contentsDragMoveEvent( QDragMoveEvent* e ); - void contentsDragLeaveEvent( QDragLeaveEvent* e ); - QDragObject* dragObject(); + bool acceptDrag(TQDropEvent* e) const; + void contentsDragMoveEvent( TQDragMoveEvent* e ); + void contentsDragLeaveEvent( TQDragLeaveEvent* e ); + TQDragObject* dragObject(); private: void clearItems(); @@ -105,7 +106,7 @@ class K3bDataFileView : public K3bListView K3bDataDirViewItem* m_dropDirItem; - QMap<K3bDataItem*, K3bDataViewItem*> m_itemMap; + TQMap<K3bDataItem*, K3bDataViewItem*> m_itemMap; // used for the urladdingdialog hack KURL::List m_addUrls; diff --git a/src/projects/k3bdataimagesettingswidget.cpp b/src/projects/k3bdataimagesettingswidget.cpp index 331e1eb..57f1474 100644 --- a/src/projects/k3bdataimagesettingswidget.cpp +++ b/src/projects/k3bdataimagesettingswidget.cpp @@ -19,14 +19,14 @@ #include "k3bisooptions.h" -#include <qcheckbox.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> -#include <qlineedit.h> -#include <qcombobox.h> -#include <qpushbutton.h> -#include <qwhatsthis.h> -#include <qlayout.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> +#include <tqlineedit.h> +#include <tqcombobox.h> +#include <tqpushbutton.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> #include <kmessagebox.h> #include <klocale.h> @@ -126,8 +126,8 @@ static void initializePresets() class K3bDataImageSettingsWidget::CustomFilesystemsDialog : public KDialogBase { public: - CustomFilesystemsDialog( QWidget* parent ) - : KDialogBase( parent, + CustomFilesystemsDialog( TQWidget* tqparent ) + : KDialogBase( tqparent, "custom_filesystems_dialog", true, i18n("Custom Data Project Filesystems"), @@ -145,8 +145,8 @@ public: class K3bDataImageSettingsWidget::VolumeDescDialog : public KDialogBase { public: - VolumeDescDialog( QWidget* parent ) - : KDialogBase( parent, + VolumeDescDialog( TQWidget* tqparent ) + : KDialogBase( tqparent, "voldesc_dialog", true, i18n("Volume Descriptor"), @@ -157,8 +157,8 @@ public: setMainWidget( w ); // give ourselves a reasonable size - QSize s = sizeHint(); - s.setWidth( QMAX(s.width(), 300) ); + TQSize s = tqsizeHint(); + s.setWidth( TQMAX(s.width(), 300) ); resize( s ); } @@ -167,21 +167,21 @@ public: -K3bDataImageSettingsWidget::K3bDataImageSettingsWidget( QWidget* parent, const char* name ) - : base_K3bDataImageSettings( parent, name ), +K3bDataImageSettingsWidget::K3bDataImageSettingsWidget( TQWidget* tqparent, const char* name ) + : base_K3bDataImageSettings( tqparent, name ), m_fileSystemOptionsShown(true) { - layout()->setMargin( KDialog::marginHint() ); + tqlayout()->setMargin( KDialog::marginHint() ); m_customFsDlg = new CustomFilesystemsDialog( this ); m_volDescDlg = new VolumeDescDialog( this ); - connect( m_buttonCustomFilesystems, SIGNAL(clicked()), - this, SLOT(slotCustomFilesystems()) ); - connect( m_buttonMoreVolDescFields, SIGNAL(clicked()), - this, SLOT(slotMoreVolDescFields()) ); - connect( m_comboSpaceHandling, SIGNAL(activated(int)), - this, SLOT(slotSpaceHandlingChanged(int)) ); + connect( m_buttonCustomFilesystems, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotCustomFilesystems()) ); + connect( m_buttonMoreVolDescFields, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotMoreVolDescFields()) ); + connect( m_comboSpaceHandling, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotSpaceHandlingChanged(int)) ); for( int i = 0; i < FS_MAX; ++i ) m_comboFilesystems->insertItem( i18n( s_fsPresetNames[i] ) ); @@ -189,7 +189,7 @@ K3bDataImageSettingsWidget::K3bDataImageSettingsWidget( QWidget* parent, const c if( !s_fsPresetsInitialized ) initializePresets(); - QWhatsThis::add( m_comboFilesystems, + TQWhatsThis::add( m_comboFilesystems, i18n("<p><b>File System Presets</b>" "<p>K3b provides the following file system Presets which allow for a quick selection " "of the most frequently used settings.") @@ -242,7 +242,7 @@ void K3bDataImageSettingsWidget::slotCustomFilesystems() K3bIsoOptions o; m_customFsDlg->w->save( o ); - if( m_customFsDlg->exec() == QDialog::Accepted ) { + if( m_customFsDlg->exec() == TQDialog::Accepted ) { slotFilesystemsChanged(); } else { @@ -258,7 +258,7 @@ void K3bDataImageSettingsWidget::slotFilesystemsChanged() return; // new custom entry - QStringList s; + TQStringList s; if( m_customFsDlg->w->m_checkRockRidge->isChecked() ) s += i18n("Rock Ridge"); if( m_customFsDlg->w->m_checkJoliet->isChecked() ) @@ -268,7 +268,7 @@ void K3bDataImageSettingsWidget::slotFilesystemsChanged() if( s.isEmpty() ) m_comboFilesystems->changeItem( i18n("Custom (ISO9660 only)"), FS_CUSTOM ); else - m_comboFilesystems->changeItem( i18n("Custom (%1)").arg( s.join(", ") ), FS_CUSTOM ); + m_comboFilesystems->changeItem( i18n("Custom (%1)").tqarg( s.join(", ") ), FS_CUSTOM ); // see if any of the presets is loaded m_comboFilesystems->setCurrentItem( FS_CUSTOM ); @@ -318,7 +318,7 @@ void K3bDataImageSettingsWidget::slotMoreVolDescFields() m_volDescDlg->w->save( o ); // exec dlg - if( m_volDescDlg->exec() == QDialog::Accepted ) { + if( m_volDescDlg->exec() == TQDialog::Accepted ) { // accept new entries m_volDescDlg->w->save( o ); m_editVolumeName->setText( o.volumeID() ); @@ -353,7 +353,7 @@ void K3bDataImageSettingsWidget::load( const K3bIsoOptions& o ) case K3bIsoOptions::extended: m_comboSpaceHandling->setCurrentItem( WS_EXTENDED_STRIP ); break; - case K3bIsoOptions::replace: + case K3bIsoOptions::tqreplace: m_comboSpaceHandling->setCurrentItem( WS_REPLACE ); break; default: @@ -387,7 +387,7 @@ void K3bDataImageSettingsWidget::save( K3bIsoOptions& o ) o.setWhiteSpaceTreatment( K3bIsoOptions::extended ); break; case WS_REPLACE: - o.setWhiteSpaceTreatment( K3bIsoOptions::replace ); + o.setWhiteSpaceTreatment( K3bIsoOptions::tqreplace ); break; default: o.setWhiteSpaceTreatment( K3bIsoOptions::noChange ); diff --git a/src/projects/k3bdataimagesettingswidget.h b/src/projects/k3bdataimagesettingswidget.h index e16226f..13086f3 100644 --- a/src/projects/k3bdataimagesettingswidget.h +++ b/src/projects/k3bdataimagesettingswidget.h @@ -25,9 +25,10 @@ class K3bIsoOptions; class K3bDataImageSettingsWidget : public base_K3bDataImageSettings { Q_OBJECT + TQ_OBJECT public: - K3bDataImageSettingsWidget( QWidget* parent = 0, const char* name = 0 ); + K3bDataImageSettingsWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bDataImageSettingsWidget(); void load( const K3bIsoOptions& ); diff --git a/src/projects/k3bdatamultisessioncombobox.cpp b/src/projects/k3bdatamultisessioncombobox.cpp index 57dd818..87e6551 100644 --- a/src/projects/k3bdatamultisessioncombobox.cpp +++ b/src/projects/k3bdatamultisessioncombobox.cpp @@ -18,8 +18,8 @@ #include <klocale.h> #include <kconfig.h> -#include <qwhatsthis.h> -#include <qtooltip.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> static const int s_autoIndex = 0; @@ -29,14 +29,14 @@ static const int s_continueIndex = 3; static const int s_finishIndex = 4; -K3bDataMultiSessionCombobox::K3bDataMultiSessionCombobox( QWidget* parent, const char* name ) - : QComboBox( parent, name ), +K3bDataMultiSessionCombobox::K3bDataMultiSessionCombobox( TQWidget* tqparent, const char* name ) + : TQComboBox( tqparent, name ), m_forceNoMultiSession(false) { init( false ); - QToolTip::add( this, i18n("Select the Multisession Mode for the project.") ); - QWhatsThis::add( this, i18n("<p><b>Multisession Mode</b>" + TQToolTip::add( this, i18n("Select the Multisession Mode for the project.") ); + TQWhatsThis::add( this, i18n("<p><b>Multisession Mode</b>" "<p><b>Auto</b><br>" "Let K3b decide which mode to use. The decision will be based " "on the size of the project (does it fill the whole media) and " @@ -101,7 +101,7 @@ K3bDataDoc::MultiSessionMode K3bDataMultiSessionCombobox::multiSessionMode() con void K3bDataMultiSessionCombobox::saveConfig( KConfigBase* c ) { - QString s; + TQString s; switch( currentItem() ) { case s_autoIndex: s = "auto"; @@ -126,7 +126,7 @@ void K3bDataMultiSessionCombobox::saveConfig( KConfigBase* c ) void K3bDataMultiSessionCombobox::loadConfig( KConfigBase* c ) { - QString s = c->readEntry( "multisession mode" ); + TQString s = c->readEntry( "multisession mode" ); if( s == "none" ) setMultiSessionMode( K3bDataDoc::NONE ); else if( s == "start" ) diff --git a/src/projects/k3bdatamultisessioncombobox.h b/src/projects/k3bdatamultisessioncombobox.h index cb44989..71ccc02 100644 --- a/src/projects/k3bdatamultisessioncombobox.h +++ b/src/projects/k3bdatamultisessioncombobox.h @@ -16,18 +16,19 @@ #ifndef _K3B_DATA_MULTISESSION_COMBOBOX_H_ #define _K3B_DATA_MULTISESSION_COMBOBOX_H_ -#include <qcombobox.h> +#include <tqcombobox.h> #include <k3bdatadoc.h> class KConfigBase; -class K3bDataMultiSessionCombobox : public QComboBox +class K3bDataMultiSessionCombobox : public TQComboBox { Q_OBJECT + TQ_OBJECT public: - K3bDataMultiSessionCombobox( QWidget* parent = 0, const char* name = 0 ); + K3bDataMultiSessionCombobox( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bDataMultiSessionCombobox(); /** diff --git a/src/projects/k3bdatapropertiesdialog.cpp b/src/projects/k3bdatapropertiesdialog.cpp index 39fec61..7cc8549 100644 --- a/src/projects/k3bdatapropertiesdialog.cpp +++ b/src/projects/k3bdatapropertiesdialog.cpp @@ -21,15 +21,15 @@ #include <kcutlabel.h> #include <k3bvalidators.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qframe.h> -#include <qcheckbox.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qtabwidget.h> -#include <qvalidator.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqframe.h> +#include <tqcheckbox.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqtabwidget.h> +#include <tqvalidator.h> #include <klineedit.h> #include <kiconloader.h> @@ -41,46 +41,46 @@ -K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, QWidget* parent, const char* name ) - : KDialogBase( Plain, i18n("File Properties"), Ok|Cancel, Ok, parent, name, true, false ) +K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidget* tqparent, const char* name ) + : KDialogBase( Plain, i18n("File Properties"), Ok|Cancel, Ok, tqparent, name, true, false ) { m_dataItem = dataItem; - QLabel* labelMimeType = new QLabel( plainPage() ); - QLabel* extraInfoLabel = new QLabel( plainPage() ); + TQLabel* labelMimeType = new TQLabel( plainPage() ); + TQLabel* extraInfoLabel = new TQLabel( plainPage() ); m_editName = new KLineEdit( plainPage() ); - m_labelType = new QLabel( plainPage() ); + m_labelType = new TQLabel( plainPage() ); m_labelLocation = new KCutLabel( plainPage() ); - m_labelSize = new QLabel( plainPage() ); - m_labelBlocks = new QLabel( plainPage() ); + m_labelSize = new TQLabel( plainPage() ); + m_labelBlocks = new TQLabel( plainPage() ); m_labelLocalName = new KCutLabel( plainPage() ); m_labelLocalLocation = new KCutLabel( plainPage() ); - QGridLayout* grid = new QGridLayout( plainPage() ); + TQGridLayout* grid = new TQGridLayout( plainPage() ); grid->setSpacing( spacingHint() ); grid->setMargin( marginHint() ); grid->addWidget( labelMimeType, 0, 0 ); grid->addWidget( m_editName, 0, 2 ); - QFrame* line = new QFrame( plainPage() ); - line->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + TQFrame* line = new TQFrame( plainPage() ); + line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); grid->addMultiCellWidget( line, 1, 1, 0, 2 ); - grid->addWidget( new QLabel( i18n("Type:"), plainPage() ), 2, 0 ); - grid->addWidget( new QLabel( i18n("Location:"), plainPage() ), 4, 0 ); - grid->addWidget( new QLabel( i18n("Size:"), plainPage() ), 5, 0 ); - grid->addWidget( new QLabel( i18n("Used blocks:"), plainPage() ), 6, 0 ); + grid->addWidget( new TQLabel( i18n("Type:"), plainPage() ), 2, 0 ); + grid->addWidget( new TQLabel( i18n("Location:"), plainPage() ), 4, 0 ); + grid->addWidget( new TQLabel( i18n("Size:"), plainPage() ), 5, 0 ); + grid->addWidget( new TQLabel( i18n("Used blocks:"), plainPage() ), 6, 0 ); grid->addWidget( m_labelType, 2, 2 ); grid->addWidget( extraInfoLabel, 3, 2 ); grid->addWidget( m_labelLocation, 4, 2 ); grid->addWidget( m_labelSize, 5, 2 ); grid->addWidget( m_labelBlocks, 6, 2 ); - line = new QFrame( plainPage() ); - line->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + line = new TQFrame( plainPage() ); + line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); grid->addMultiCellWidget( line, 7, 7, 0, 2 ); - QLabel* label1 = new QLabel( i18n("Local name:"), plainPage() ); + TQLabel* label1 = new TQLabel( i18n("Local name:"), plainPage() ); grid->addWidget( label1, 8, 0 ); - QLabel* label2 = new QLabel( i18n("Local location:"), plainPage() ); + TQLabel* label2 = new TQLabel( i18n("Local location:"), plainPage() ); grid->addWidget( label2, 9, 0 ); grid->addWidget( m_labelLocalName, 8, 2 ); grid->addWidget( m_labelLocalLocation, 9, 2 ); @@ -94,12 +94,12 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, QWidget KFileItem kFileItem( KFileItem::Unknown, KFileItem::Unknown, KURL::fromPathOrURL(fileItem->localPath()) ); labelMimeType->setPixmap( kFileItem.pixmap(KIcon::SizeLarge) ); if( fileItem->isSymLink() ) - m_labelType->setText( i18n("Link to %1").arg(kFileItem.mimeComment()) ); + m_labelType->setText( i18n("Link to %1").tqarg(kFileItem.mimeComment()) ); else m_labelType->setText( kFileItem.mimeComment() ); m_labelLocalName->setText( kFileItem.name() ); - QString localLocation = kFileItem.url().path(-1); - localLocation.truncate( localLocation.findRev('/') ); + TQString localLocation = kFileItem.url().path(-1); + localLocation.truncate( localLocation.tqfindRev('/') ); m_labelLocalLocation->setText( localLocation ); m_labelSize->setText( KIO::convertSize(dataItem->size()) ); } @@ -127,49 +127,49 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, QWidget } m_editName->setText( dataItem->k3bName() ); - m_labelBlocks->setText( QString::number(dataItem->blocks().lba()) ); + m_labelBlocks->setText( TQString::number(dataItem->blocks().lba()) ); - QString location = "/" + dataItem->k3bPath(); + TQString location = "/" + dataItem->k3bPath(); if( location[location.length()-1] == '/' ) location.truncate( location.length()-1 ); - location.truncate( location.findRev('/') ); + location.truncate( location.tqfindRev('/') ); if( location.isEmpty() ) location = "/"; m_labelLocation->setText( location ); - extraInfoLabel->setText( QString( "(%1)" ).arg(dataItem->extraInfo()) ); + extraInfoLabel->setText( TQString( "(%1)" ).tqarg(dataItem->extraInfo()) ); if( dataItem->extraInfo().isEmpty() ) extraInfoLabel->hide(); // OPTIONS // ///////////////////////////////////////////////// - QTabWidget* optionTab = new QTabWidget( plainPage() ); - line = new QFrame( plainPage() ); - line->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + TQTabWidget* optionTab = new TQTabWidget( plainPage() ); + line = new TQFrame( plainPage() ); + line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); grid->addMultiCellWidget( line, 10, 10, 0, 2 ); grid->addMultiCellWidget( optionTab, 12, 12, 0, 2 ); grid->setRowStretch( 11, 1 ); - QWidget* hideBox = new QWidget( optionTab ); - QGridLayout* hideBoxGrid = new QGridLayout( hideBox ); + TQWidget* hideBox = new TQWidget( optionTab ); + TQGridLayout* hideBoxGrid = new TQGridLayout( hideBox ); hideBoxGrid->setSpacing( spacingHint() ); hideBoxGrid->setMargin( marginHint() ); - m_checkHideOnRockRidge = new QCheckBox( i18n("Hide on Rockridge"), hideBox ); - m_checkHideOnJoliet = new QCheckBox( i18n("Hide on Joliet"), hideBox ); + m_checkHideOnRockRidge = new TQCheckBox( i18n("Hide on Rockridge"), hideBox ); + m_checkHideOnJoliet = new TQCheckBox( i18n("Hide on Joliet"), hideBox ); hideBoxGrid->addWidget( m_checkHideOnRockRidge, 0, 0 ); hideBoxGrid->addWidget( m_checkHideOnJoliet, 1, 0 ); hideBoxGrid->setRowStretch( 2, 1 ); // grid->addMultiCellWidget( m_checkHideOnRockRidge, 10, 10, 0, 2 ); // grid->addMultiCellWidget( m_checkHideOnJoliet, 11, 11, 0, 2 ); - QWidget* sortingBox = new QWidget( optionTab ); - QGridLayout* sortingBoxGrid = new QGridLayout( sortingBox ); + TQWidget* sortingBox = new TQWidget( optionTab ); + TQGridLayout* sortingBoxGrid = new TQGridLayout( sortingBox ); sortingBoxGrid->setSpacing( spacingHint() ); sortingBoxGrid->setMargin( marginHint() ); m_editSortWeight = new KLineEdit( sortingBox ); - m_editSortWeight->setValidator( new QIntValidator( -2147483647, 2147483647, m_editSortWeight ) ); - m_editSortWeight->setAlignment( Qt::AlignRight ); - sortingBoxGrid->addWidget( new QLabel( i18n("Sort weight:"), sortingBox ), 0, 0 ); + m_editSortWeight->setValidator( new TQIntValidator( -2147483647, 2147483647, TQT_TQOBJECT(m_editSortWeight) ) ); + m_editSortWeight->tqsetAlignment( TQt::AlignRight ); + sortingBoxGrid->addWidget( new TQLabel( i18n("Sort weight:"), sortingBox ), 0, 0 ); sortingBoxGrid->addWidget( m_editSortWeight, 0, 1 ); sortingBoxGrid->setColStretch( 1, 1 ); sortingBoxGrid->setRowStretch( 1, 1 ); @@ -180,12 +180,12 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, QWidget m_checkHideOnJoliet->setChecked( dataItem->hideOnJoliet() ); m_checkHideOnRockRidge->setChecked( dataItem->hideOnRockRidge() ); - m_editSortWeight->setText( QString::number(dataItem->sortWeight()) ); + m_editSortWeight->setText( TQString::number(dataItem->sortWeight()) ); - // if the parent is hidden the value cannot be changed (see K3bDataItem::setHide...) - if( dataItem->parent() ) { - m_checkHideOnRockRidge->setDisabled( dataItem->parent()->hideOnRockRidge() ); - m_checkHideOnJoliet->setDisabled( dataItem->parent()->hideOnJoliet() ); + // if the tqparent is hidden the value cannot be changed (see K3bDataItem::setHide...) + if( dataItem->tqparent() ) { + m_checkHideOnRockRidge->setDisabled( dataItem->tqparent()->hideOnRockRidge() ); + m_checkHideOnJoliet->setDisabled( dataItem->tqparent()->hideOnJoliet() ); } if( !dataItem->isHideable() ) { @@ -194,35 +194,35 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, QWidget // line->hide(); } - QToolTip::add( m_checkHideOnRockRidge, i18n("Hide this file in the RockRidge filesystem") ); - QToolTip::add( m_checkHideOnJoliet, i18n("Hide this file in the Joliet filesystem") ); - QToolTip::add( m_editSortWeight, i18n("Modify the physical sorting") ); - QWhatsThis::add( m_checkHideOnRockRidge, i18n("<p>If this option is checked, the file or directory " + TQToolTip::add( m_checkHideOnRockRidge, i18n("Hide this file in the RockRidge filesystem") ); + TQToolTip::add( m_checkHideOnJoliet, i18n("Hide this file in the Joliet filesystem") ); + TQToolTip::add( m_editSortWeight, i18n("Modify the physical sorting") ); + TQWhatsThis::add( m_checkHideOnRockRidge, i18n("<p>If this option is checked, the file or directory " "(and its entire contents) will be hidden on the " "ISO9660 and RockRidge filesystem.</p>" "<p>This is useful, for example, for having different README " "files for RockRidge and Joliet, which can be managed " "by hiding README.joliet on RockRidge and README.rr " "on the Joliet filesystem.</p>") ); - QWhatsThis::add( m_checkHideOnJoliet, i18n("<p>If this option is checked, the file or directory " + TQWhatsThis::add( m_checkHideOnJoliet, i18n("<p>If this option is checked, the file or directory " "(and its entire contents) will be hidden on the " "Joliet filesystem.</p>" "<p>This is useful, for example, for having different README " "files for RockRidge and Joliet, which can be managed " "by hiding README.joliet on RockRidge and README.rr " "on the Joliet filesystem.</p>") ); - QWhatsThis::add( m_editSortWeight, i18n("<p>This value modifies the physical sort order of the files " + TQWhatsThis::add( m_editSortWeight, i18n("<p>This value modifies the physical sort order of the files " "in the ISO9660 filesystem. A higher weighting means that the " "file will be located closer to the beginning of the image " "(and the disk)." - "<p>This option is useful in order to optimize the data layout " + "<p>This option is useful in order to optimize the data tqlayout " "on a CD/DVD." "<p><b>Caution:</b> This does not sort the order of the file " "names that appear in the ISO9660 directory." "It sorts the order in which the file data is " "written to the image.") ); - m_editName->setValidator( K3bValidators::iso9660Validator( false, this ) ); + m_editName->setValidator( K3bValidators::iso9660Validator( false, TQT_TQOBJECT(this) ) ); m_editName->setReadOnly( !dataItem->isRenameable() ); m_editName->setFocus(); } diff --git a/src/projects/k3bdatapropertiesdialog.h b/src/projects/k3bdatapropertiesdialog.h index eb585ce..8c79c47 100644 --- a/src/projects/k3bdatapropertiesdialog.h +++ b/src/projects/k3bdatapropertiesdialog.h @@ -22,9 +22,9 @@ class K3bDataItem; class KLineEdit; -class QPushButton; -class QLabel; -class QCheckBox; +class TQPushButton; +class TQLabel; +class TQCheckBox; /** @@ -33,9 +33,10 @@ class QCheckBox; class K3bDataPropertiesDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - K3bDataPropertiesDialog( K3bDataItem*, QWidget* parent = 0, const char* name = 0 ); + K3bDataPropertiesDialog( K3bDataItem*, TQWidget* tqparent = 0, const char* name = 0 ); ~K3bDataPropertiesDialog(); protected slots: @@ -43,16 +44,16 @@ Q_OBJECT private: KLineEdit* m_editName; - QLabel* m_labelType; - QLabel* m_labelLocation; - QLabel* m_labelSize; - QLabel* m_labelBlocks; + TQLabel* m_labelType; + TQLabel* m_labelLocation; + TQLabel* m_labelSize; + TQLabel* m_labelBlocks; - QLabel* m_labelLocalName; - QLabel* m_labelLocalLocation; + TQLabel* m_labelLocalName; + TQLabel* m_labelLocalLocation; - QCheckBox* m_checkHideOnRockRidge; - QCheckBox* m_checkHideOnJoliet; + TQCheckBox* m_checkHideOnRockRidge; + TQCheckBox* m_checkHideOnJoliet; KLineEdit* m_editSortWeight; K3bDataItem* m_dataItem; diff --git a/src/projects/k3bdatasessionimportdialog.cpp b/src/projects/k3bdatasessionimportdialog.cpp index f6f1b85..80e45f1 100644 --- a/src/projects/k3bdatasessionimportdialog.cpp +++ b/src/projects/k3bdatasessionimportdialog.cpp @@ -22,16 +22,16 @@ #include <k3bmediacache.h> #include <k3b.h> -#include <qpushbutton.h> -#include <qcursor.h> -#include <qapplication.h> +#include <tqpushbutton.h> +#include <tqcursor.h> +#include <tqapplication.h> #include <klocale.h> #include <kmessagebox.h> -K3bDataSessionImportDialog::K3bDataSessionImportDialog( QWidget* parent ) - : KDialogBase( parent, +K3bDataSessionImportDialog::K3bDataSessionImportDialog( TQWidget* tqparent ) + : KDialogBase( tqparent, "session_import_dialog", true, i18n("Session Import"), @@ -42,8 +42,8 @@ K3bDataSessionImportDialog::K3bDataSessionImportDialog( QWidget* parent ) m_comboMedia = new K3bMediaSelectionComboBox( this ); setMainWidget( m_comboMedia ); - connect( m_comboMedia, SIGNAL(selectionChanged(K3bDevice::Device*)), - this, SLOT(slotSelectionChanged(K3bDevice::Device*)) ); + connect( m_comboMedia, TQT_SIGNAL(selectionChanged(K3bDevice::Device*)), + this, TQT_SLOT(slotSelectionChanged(K3bDevice::Device*)) ); } @@ -74,7 +74,7 @@ void K3bDataSessionImportDialog::slotOk() { // find the selected device, show a busy mouse cursor and call K3bDataDoc::importSession if( K3bDevice::Device* dev = m_comboMedia->selectedDevice() ) { - QApplication::setOverrideCursor( QCursor(Qt::WaitCursor) ); + TQApplication::setOverrideCursor( TQCursor(TQt::WaitCursor) ); // // Mkisofs does not properly import joliet filenames from an old session @@ -104,7 +104,7 @@ void K3bDataSessionImportDialog::slotOk() m_doc->setBurner( dev ); m_doc->importSession( dev ); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); done( 0 ); } @@ -125,9 +125,9 @@ void K3bDataSessionImportDialog::slotSelectionChanged( K3bDevice::Device* dev ) } -K3bDataDoc* K3bDataSessionImportDialog::importSession( K3bDataDoc* doc, QWidget* parent ) +K3bDataDoc* K3bDataSessionImportDialog::importSession( K3bDataDoc* doc, TQWidget* tqparent ) { - K3bDataSessionImportDialog dlg( parent ); + K3bDataSessionImportDialog dlg( tqparent ); dlg.importSession( doc ); dlg.exec(); return dlg.m_doc; diff --git a/src/projects/k3bdatasessionimportdialog.h b/src/projects/k3bdatasessionimportdialog.h index 77c074f..7a092db 100644 --- a/src/projects/k3bdatasessionimportdialog.h +++ b/src/projects/k3bdatasessionimportdialog.h @@ -18,13 +18,13 @@ #include <kdialogbase.h> -#include <qptrlist.h> -#include <qmap.h> +#include <tqptrlist.h> +#include <tqmap.h> #include <k3bdevice.h> -class QLabel; +class TQLabel; class KListBox; class K3bDataDoc; class K3bMediaSelectionComboBox; @@ -33,6 +33,7 @@ class K3bMediaSelectionComboBox; class K3bDataSessionImportDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** @@ -44,7 +45,7 @@ class K3bDataSessionImportDialog : public KDialogBase * * \return the project */ - static K3bDataDoc* importSession( K3bDataDoc* doc, QWidget* parent ); + static K3bDataDoc* importSession( K3bDataDoc* doc, TQWidget* tqparent ); private slots: void slotOk(); @@ -54,7 +55,7 @@ class K3bDataSessionImportDialog : public KDialogBase void slotSelectionChanged( K3bDevice::Device* ); private: - K3bDataSessionImportDialog( QWidget* parent = 0 ); + K3bDataSessionImportDialog( TQWidget* tqparent = 0 ); ~K3bDataSessionImportDialog(); K3bDataDoc* m_doc; diff --git a/src/projects/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp index 2edb43b..1a645ff 100644 --- a/src/projects/k3bdataurladdingdialog.cpp +++ b/src/projects/k3bdataurladdingdialog.cpp @@ -18,11 +18,11 @@ #include "k3bdataurladdingdialog.h" #include "k3bencodingconverter.h" -#include <qtimer.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qdir.h> -#include <qfileinfo.h> +#include <tqtimer.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqdir.h> +#include <tqfileinfo.h> #include <k3bdatadoc.h> #include <k3bdiritem.h> @@ -55,12 +55,12 @@ #include <unistd.h> -K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, QWidget* parent, const char* name ) +K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* tqparent, const char* name ) : KDialogBase( Plain, - i18n("Adding files to project '%1'").arg(doc->URL().fileName()), + i18n("Adding files to project '%1'").tqarg(doc->URL().fileName()), Cancel, Cancel, - parent, + tqparent, name, true, true ), @@ -77,26 +77,26 @@ K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, QWidget* parent { m_encodingConverter = new K3bEncodingConverter(); - QWidget* page = plainPage(); - QGridLayout* grid = new QGridLayout( page ); + TQWidget* page = plainPage(); + TQGridLayout* grid = new TQGridLayout( page ); grid->setSpacing( spacingHint() ); grid->setMargin( 0 ); - m_counterLabel = new QLabel( page ); + m_counterLabel = new TQLabel( page ); m_infoLabel = new KSqueezedTextLabel( i18n("Adding files to project '%1'") - .arg(doc->URL().fileName()) + "...", page ); + .tqarg(doc->URL().fileName()) + "...", page ); m_progressWidget = new KProgress( 0, page ); grid->addWidget( m_counterLabel, 0, 1 ); grid->addWidget( m_infoLabel, 0, 0 ); grid->addMultiCellWidget( m_progressWidget, 1, 1, 0, 1 ); - m_dirSizeJob = new K3bDirSizeJob( this ); - connect( m_dirSizeJob, SIGNAL(finished(bool)), - this, SLOT(slotDirSizeDone(bool)) ); + m_dirSizeJob = new K3bDirSizeJob( TQT_TQOBJECT(this) ); + connect( m_dirSizeJob, TQT_SIGNAL(finished(bool)), + this, TQT_SLOT(slotDirSizeDone(bool)) ); // try to start with a reasonable size - resize( (int)( fontMetrics().width( caption() ) * 1.5 ), sizeHint().height() ); + resize( (int)( fontMetrics().width( caption() ) * 1.5 ), tqsizeHint().height() ); } @@ -108,7 +108,7 @@ K3bDataUrlAddingDialog::~K3bDataUrlAddingDialog() int K3bDataUrlAddingDialog::addUrls( const KURL::List& urls, K3bDirItem* dir, - QWidget* parent ) + TQWidget* tqparent ) { if( urls.isEmpty() ) return 0; @@ -120,7 +120,7 @@ int K3bDataUrlAddingDialog::addUrls( const KURL::List& urls, if( urls.count() == 1 ) { K3bIso9660 isoF( urls.first().path() ); if( isoF.open() ) { - if( KMessageBox::warningYesNo( parent, + if( KMessageBox::warningYesNo( tqparent, i18n("<p>The file you are about to add to the project is an ISO9660 image. As such " "it can be burned to a medium directly since it already contains a file " "system.<br>" @@ -138,13 +138,13 @@ int K3bDataUrlAddingDialog::addUrls( const KURL::List& urls, } } - K3bDataUrlAddingDialog dlg( dir->doc(), parent ); + K3bDataUrlAddingDialog dlg( dir->doc(), tqparent ); dlg.m_urls = urls; for( KURL::List::ConstIterator it = urls.begin(); it != urls.end(); ++it ) - dlg.m_urlQueue.append( qMakePair( K3b::convertToLocalUrl(*it), dir ) ); + dlg.m_urlQueue.append( tqMakePair( K3b::convertToLocalUrl(*it), dir ) ); dlg.slotAddUrls(); - int ret = QDialog::Accepted; + int ret = TQDialog::Accepted; if( !dlg.m_urlQueue.isEmpty() ) { dlg.m_dirSizeJob->setUrls( urls ); dlg.m_dirSizeJob->setFollowSymlinks( dir->doc()->isoOptions().followSymbolicLinks() ); @@ -156,77 +156,77 @@ int K3bDataUrlAddingDialog::addUrls( const KURL::List& urls, dlg.m_dirSizeJob->cancel(); K3bSignalWaiter::waitForJob( dlg.m_dirSizeJob ); - QString message = dlg.resultMessage(); + TQString message = dlg.resultMessage(); if( !message.isEmpty() ) - KMessageBox::detailedSorry( parent, i18n("Problems while adding files to the project."), message ); + KMessageBox::detailedSorry( tqparent, i18n("Problems while adding files to the project."), message ); return ret; } -QString K3bDataUrlAddingDialog::resultMessage() const +TQString K3bDataUrlAddingDialog::resultMessage() const { - QString message; + TQString message; if( !m_unreadableFiles.isEmpty() ) - message += QString("<p><b>%1:</b><br>%2") - .arg( i18n("Insufficient permissions to read the following files") ) - .arg( m_unreadableFiles.join( "<br>" ) ); + message += TQString("<p><b>%1:</b><br>%2") + .tqarg( i18n("Insufficient permissions to read the following files") ) + .tqarg( m_unreadableFiles.join( "<br>" ) ); if( !m_notFoundFiles.isEmpty() ) - message += QString("<p><b>%1:</b><br>%2") - .arg( i18n("Unable to find the following files") ) - .arg( m_notFoundFiles.join( "<br>" ) ); + message += TQString("<p><b>%1:</b><br>%2") + .tqarg( i18n("Unable to find the following files") ) + .tqarg( m_notFoundFiles.join( "<br>" ) ); if( !m_nonLocalFiles.isEmpty() ) - message += QString("<p><b>%1:</b><br>%2") - .arg( i18n("No non-local files supported") ) - .arg( m_unreadableFiles.join( "<br>" ) ); + message += TQString("<p><b>%1:</b><br>%2") + .tqarg( i18n("No non-local files supported") ) + .tqarg( m_unreadableFiles.join( "<br>" ) ); if( !m_tooBigFiles.isEmpty() ) - message += QString("<p><b>%1:</b><br>%2") - .arg( i18n("It is not possible to add files bigger than %1").arg(KIO::convertSize(0xFFFFFFFF)) ) - .arg( m_tooBigFiles.join( "<br>" ) ); + message += TQString("<p><b>%1:</b><br>%2") + .tqarg( i18n("It is not possible to add files bigger than %1").tqarg(KIO::convertSize(0xFFFFFFFF)) ) + .tqarg( m_tooBigFiles.join( "<br>" ) ); if( !m_mkisofsLimitationRenamedFiles.isEmpty() ) - message += QString("<p><b>%1:</b><br>%2") - .arg( i18n("Some filenames had to be modified due to limitations in mkisofs") ) - .arg( m_mkisofsLimitationRenamedFiles.join( "<br>" ) ); + message += TQString("<p><b>%1:</b><br>%2") + .tqarg( i18n("Some filenames had to be modified due to limitations in mkisofs") ) + .tqarg( m_mkisofsLimitationRenamedFiles.join( "<br>" ) ); if( !m_invalidFilenameEncodingFiles.isEmpty() ) - message += QString("<p><b>%1:</b><br>%2") - .arg( i18n("The following filenames have an invalid encoding. You may fix this " + message += TQString("<p><b>%1:</b><br>%2") + .tqarg( i18n("The following filenames have an invalid encoding. You may fix this " "with the convmv tool") ) - .arg( m_invalidFilenameEncodingFiles.join( "<br>" ) ); + .tqarg( m_invalidFilenameEncodingFiles.join( "<br>" ) ); return message; } -int K3bDataUrlAddingDialog::moveItems( const QValueList<K3bDataItem*>& items, +int K3bDataUrlAddingDialog::moveItems( const TQValueList<K3bDataItem*>& items, K3bDirItem* dir, - QWidget* parent ) + TQWidget* tqparent ) { - return copyMoveItems( items, dir, parent, false ); + return copyMoveItems( items, dir, tqparent, false ); } -int K3bDataUrlAddingDialog::copyItems( const QValueList<K3bDataItem*>& items, +int K3bDataUrlAddingDialog::copyItems( const TQValueList<K3bDataItem*>& items, K3bDirItem* dir, - QWidget* parent ) + TQWidget* tqparent ) { - return copyMoveItems( items, dir, parent, true ); + return copyMoveItems( items, dir, tqparent, true ); } -int K3bDataUrlAddingDialog::copyMoveItems( const QValueList<K3bDataItem*>& items, +int K3bDataUrlAddingDialog::copyMoveItems( const TQValueList<K3bDataItem*>& items, K3bDirItem* dir, - QWidget* parent, + TQWidget* tqparent, bool copy ) { if( items.isEmpty() ) return 0; - K3bDataUrlAddingDialog dlg( dir->doc(), parent ); - dlg.m_infoLabel->setText( i18n("Moving files to project \"%1\"...").arg(dir->doc()->URL().fileName()) ); + K3bDataUrlAddingDialog dlg( dir->doc(), tqparent ); + dlg.m_infoLabel->setText( i18n("Moving files to project \"%1\"...").tqarg(dir->doc()->URL().fileName()) ); dlg.m_copyItems = copy; - for( QValueList<K3bDataItem*>::const_iterator it = items.begin(); it != items.end(); ++it ) { - dlg.m_items.append( qMakePair( *it, dir ) ); + for( TQValueList<K3bDataItem*>::const_iterator it = items.begin(); it != items.end(); ++it ) { + dlg.m_items.append( tqMakePair( *it, dir ) ); ++dlg.m_totalFiles; if( (*it)->isDir() ) { dlg.m_totalFiles += static_cast<K3bDirItem*>( *it )->numFiles(); @@ -235,7 +235,7 @@ int K3bDataUrlAddingDialog::copyMoveItems( const QValueList<K3bDataItem*>& items } dlg.slotCopyMoveItems(); - int ret = QDialog::Accepted; + int ret = TQDialog::Accepted; if( !dlg.m_items.isEmpty() ) { dlg.m_progressWidget->setTotalSteps( dlg.m_totalFiles ); ret = dlg.exec(); @@ -264,13 +264,13 @@ void K3bDataUrlAddingDialog::slotAddUrls() m_urlQueue.remove( m_urlQueue.begin() ); // // HINT: - // we only use QFileInfo::absFilePath() and QFileInfo::isHidden() - // both do not cause QFileInfo to stat, thus no speed improvement - // can come from removing QFileInfo usage here. + // we only use TQFileInfo::absFilePath() and TQFileInfo::isHidden() + // both do not cause TQFileInfo to stat, thus no speed improvement + // can come from removing TQFileInfo usage here. // - QFileInfo info(url.path()); - QString absFilePath( info.absFilePath() ); - QString resolved( absFilePath ); + TQFileInfo info(url.path()); + TQString absFilePath( info.absFilePath() ); + TQString resolved( absFilePath ); bool valid = true; k3b_struct_stat statBuf, resolvedStatBuf; @@ -283,9 +283,9 @@ void K3bDataUrlAddingDialog::slotAddUrls() #if 0 m_infoLabel->setText( url.path() ); if( m_totalFiles == 0 ) - m_counterLabel->setText( QString("(%1)").arg(m_filesHandled) ); + m_counterLabel->setText( TQString("(%1)").tqarg(m_filesHandled) ); else - m_counterLabel->setText( QString("(%1/%2)").arg(m_filesHandled).arg(m_totalFiles) ); + m_counterLabel->setText( TQString("(%1/%2)").tqarg(m_filesHandled).tqarg(m_totalFiles) ); #endif // @@ -297,12 +297,12 @@ void K3bDataUrlAddingDialog::slotAddUrls() m_nonLocalFiles.append( url.path() ); } - else if( k3b_lstat( QFile::encodeName(absFilePath), &statBuf ) != 0 ) { + else if( k3b_lstat( TQFile::encodeName(absFilePath), &statBuf ) != 0 ) { valid = false; m_notFoundFiles.append( url.path() ); } - else if( !m_encodingConverter->encodedLocally( QFile::encodeName( url.path() ) ) ) { + else if( !m_encodingConverter->encodedLocally( TQFile::encodeName( url.path() ) ) ) { valid = false; m_invalidFilenameEncodingFiles.append( url.path() ); } @@ -316,12 +316,12 @@ void K3bDataUrlAddingDialog::slotAddUrls() // but we need to know if the symlink points to a directory if( isSymLink ) { resolved = K3b::resolveLink( absFilePath ); - k3b_stat( QFile::encodeName(resolved), &resolvedStatBuf ); + k3b_stat( TQFile::encodeName(resolved), &resolvedStatBuf ); isDir = S_ISDIR(resolvedStatBuf.st_mode); } else { - if( ::access( QFile::encodeName( absFilePath ), R_OK ) != 0 ) { + if( ::access( TQFile::encodeName( absFilePath ), R_OK ) != 0 ) { valid = false; m_unreadableFiles.append( url.path() ); } @@ -362,7 +362,7 @@ void K3bDataUrlAddingDialog::slotAddUrls() // 2. Handle the url // - QString newName = url.fileName(); + TQString newName = url.fileName(); // filenames cannot end in backslashes (mkisofs problem. See comments in k3bisoimager.cpp (escapeGraftPoint())) bool bsAtEnd = false; @@ -384,7 +384,7 @@ void K3bDataUrlAddingDialog::slotAddUrls() // and if so handle it properly // if( valid ) { - if( K3bDataItem* oldItem = dir->find( newName ) ) { + if( K3bDataItem* oldItem = dir->tqfind( newName ) ) { // // reuse an existing dir // @@ -425,32 +425,32 @@ void K3bDataUrlAddingDialog::slotAddUrls() switch( K3bMultiChoiceDialog::choose( i18n("File already exists"), i18n("<p>File <em>%1</em> already exists in " "project folder <em>%2</em>.") - .arg(newName) - .arg('/' + dir->k3bPath()), - QMessageBox::Warning, + .tqarg(newName) + .tqarg('/' + dir->k3bPath()), + TQMessageBox::Warning, this, 0, 6, KGuiItem( i18n("Replace"), - QString::null, + TQString(), i18n("Replace the existing file") ), KGuiItem( i18n("Replace All"), - QString::null, + TQString(), i18n("Always replace existing files") ), KGuiItem( i18n("Ignore"), - QString::null, + TQString(), i18n("Keep the existing file") ), KGuiItem( i18n("Ignore All"), - QString::null, + TQString(), i18n("Always keep the existing file") ), KGuiItem( i18n("Rename"), - QString::null, + TQString(), i18n("Rename the new file") ), KStdGuiItem::cancel() ) ) { case 2: // replace all m_bExistingItemsReplaceAll = true; // fallthrough - case 1: // replace + case 1: // tqreplace // if we replace an item from an old session the K3bFileItem constructor takes care // of replacing the item if( !oldItem->isFromOldSession() ) @@ -493,9 +493,9 @@ void K3bDataUrlAddingDialog::slotAddUrls() "K3b project cannot be resolved." "<p><b>If you do not intend to enable the option <em>follow symbolic links</em> you may safely " "ignore this warning and choose to add the link to the project.</b>") - .arg(absFilePath) - .arg(resolved ), - QMessageBox::Warning, + .tqarg(absFilePath) + .tqarg(resolved ), + TQMessageBox::Warning, this, 0, 5, @@ -558,17 +558,17 @@ void K3bDataUrlAddingDialog::slotAddUrls() newDirItem->setLocalPath( url.path() ); // HACK: see k3bdiritem.h } - QDir newDir( absFilePath ); - int dirFilter = QDir::All|QDir::Hidden|QDir::System; + TQDir newDir( absFilePath ); + int dirFilter = TQDir::All|TQDir::Hidden|TQDir::System; - QStringList dlist = newDir.entryList( dirFilter ); - const QString& dot = KGlobal::staticQString( "." ); - const QString& dotdot = KGlobal::staticQString( ".." ); + TQStringList dlist = newDir.entryList( dirFilter ); + const TQString& dot = KGlobal::staticQString( "." ); + const TQString& dotdot = KGlobal::staticQString( ".." ); dlist.remove( dot ); dlist.remove( dotdot ); - for( QStringList::Iterator it = dlist.begin(); it != dlist.end(); ++it ) { - m_urlQueue.append( qMakePair( KURL::fromPathOrURL(absFilePath + '/' + *it), newDirItem ) ); + for( TQStringList::Iterator it = dlist.begin(); it != dlist.end(); ++it ) { + m_urlQueue.append( tqMakePair( KURL::fromPathOrURL(absFilePath + '/' + *it), newDirItem ) ); } } else { @@ -583,7 +583,7 @@ void K3bDataUrlAddingDialog::slotAddUrls() } else { updateProgress(); - QTimer::singleShot( 0, this, SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(slotAddUrls()) ); } } @@ -603,13 +603,13 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems() ++m_filesHandled; m_infoLabel->setText( item->k3bPath() ); if( m_totalFiles == 0 ) - m_counterLabel->setText( QString("(%1)").arg(m_filesHandled) ); + m_counterLabel->setText( TQString("(%1)").tqarg(m_filesHandled) ); else - m_counterLabel->setText( QString("(%1/%2)").arg(m_filesHandled).arg(m_totalFiles) ); + m_counterLabel->setText( TQString("(%1/%2)").tqarg(m_filesHandled).tqarg(m_totalFiles) ); - if( dir == item->parent() ) { - kdDebug() << "(K3bDataUrlAddingDialog) trying to move an item into its own parent dir." << endl; + if( dir == item->tqparent() ) { + kdDebug() << "(K3bDataUrlAddingDialog) trying to move an item into its own tqparent dir." << endl; } else if( dir == item ) { kdDebug() << "(K3bDataUrlAddingDialog) trying to move an item into itselft." << endl; @@ -618,14 +618,14 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems() // // Let's see if an item with that name alredy exists // - if( K3bDataItem* oldItem = dir->find( item->k3bName() ) ) { + if( K3bDataItem* oldItem = dir->tqfind( item->k3bName() ) ) { // // reuse an existing dir: move all child items into the old dir // if( oldItem->isDir() && item->isDir() ) { - const QPtrList<K3bDataItem>& cl = dynamic_cast<K3bDirItem*>( item )->children(); - for( QPtrListIterator<K3bDataItem> it( cl ); *it; ++it ) - m_items.append( qMakePair( *it, dynamic_cast<K3bDirItem*>( oldItem ) ) ); + const TQPtrList<K3bDataItem>& cl = dynamic_cast<K3bDirItem*>( item )->tqchildren(); + for( TQPtrListIterator<K3bDataItem> it( cl ); *it; ++it ) + m_items.append( tqMakePair( *it, dynamic_cast<K3bDirItem*>( oldItem ) ) ); // FIXME: we need to remove the old dir item } @@ -636,7 +636,7 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems() // else if( oldItem->isFromOldSession() && item->isDir() != oldItem->isDir() ) { - QString newName; + TQString newName; if( getNewName( newName, dir, newName ) ) { if( m_copyItems ) item = item->copy(); @@ -661,32 +661,32 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems() switch( K3bMultiChoiceDialog::choose( i18n("File already exists"), i18n("<p>File <em>%1</em> already exists in " "project folder <em>%2</em>.") - .arg( item->k3bName() ) - .arg("/" + dir->k3bPath()), - QMessageBox::Warning, + .tqarg( item->k3bName() ) + .tqarg("/" + dir->k3bPath()), + TQMessageBox::Warning, this, 0, 6, KGuiItem( i18n("Replace"), - QString::null, + TQString(), i18n("Replace the existing file") ), KGuiItem( i18n("Replace All"), - QString::null, + TQString(), i18n("Always replace existing files") ), KGuiItem( i18n("Ignore"), - QString::null, + TQString(), i18n("Keep the existing file") ), KGuiItem( i18n("Ignore All"), - QString::null, + TQString(), i18n("Always keep the existing file") ), KGuiItem( i18n("Rename"), - QString::null, + TQString(), i18n("Rename the new file") ), KStdGuiItem::cancel() ) ) { case 2: // replace all m_bExistingItemsReplaceAll = true; // fallthrough - case 1: // replace + case 1: // tqreplace // // if we replace an item from an old session K3bDirItem::addDataItem takes care // of replacing the item @@ -704,7 +704,7 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems() // do nothing break; case 5: {// rename - QString newName; + TQString newName; if( getNewName( newName, dir, newName ) ) { if( m_copyItems ) item = item->copy(); @@ -736,22 +736,22 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems() } else { updateProgress(); - QTimer::singleShot( 0, this, SLOT(slotCopyMoveItems()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(slotCopyMoveItems()) ); } } -bool K3bDataUrlAddingDialog::getNewName( const QString& oldName, K3bDirItem* dir, QString& newName ) +bool K3bDataUrlAddingDialog::getNewName( const TQString& oldName, K3bDirItem* dir, TQString& newName ) { bool ok = true; newName = oldName; - QValidator* validator = K3bValidators::iso9660Validator( false, this ); + TQValidator* validator = K3bValidators::iso9660Validator( false, TQT_TQOBJECT(this) ); do { newName = KInputDialog::getText( i18n("Enter New Filename"), i18n("A file with that name already exists. Please enter a new name:"), newName, &ok, this, "renamedialog", validator ); - } while( ok && dir->find( newName ) ); + } while( ok && dir->tqfind( newName ) ); delete validator; @@ -763,7 +763,7 @@ bool K3bDataUrlAddingDialog::addHiddenFiles() { if( m_iAddHiddenFiles == 0 ) { // FIXME: the isVisible() stuff makes the static addUrls method not return (same below) - if( KMessageBox::questionYesNo( /*isVisible() ? */this/* : parentWidget()*/, + if( KMessageBox::questionYesNo( /*isVisible() ? */this/* : tqparentWidget()*/, i18n("Do you also want to add hidden files?"), i18n("Hidden Files"), i18n("Add"), i18n("Do Not Add") ) == KMessageBox::Yes ) m_iAddHiddenFiles = 1; @@ -778,7 +778,7 @@ bool K3bDataUrlAddingDialog::addHiddenFiles() bool K3bDataUrlAddingDialog::addSystemFiles() { if( m_iAddSystemFiles == 0 ) { - if( KMessageBox::questionYesNo( /*isVisible() ? */this/* : parentWidget()*/, + if( KMessageBox::questionYesNo( /*isVisible() ? */this/* : tqparentWidget()*/, i18n("Do you also want to add system files " "(FIFOs, sockets, device files, and broken symlinks)?"), i18n("System Files"), i18n("Add"), i18n("Do Not Add") ) == KMessageBox::Yes ) diff --git a/src/projects/k3bdataurladdingdialog.h b/src/projects/k3bdataurladdingdialog.h index cb7c0ac..ca6b4b2 100644 --- a/src/projects/k3bdataurladdingdialog.h +++ b/src/projects/k3bdataurladdingdialog.h @@ -18,12 +18,12 @@ #include <kdialogbase.h> #include <kurl.h> -#include <qstringlist.h> -#include <qpair.h> -#include <qdir.h> +#include <tqstringlist.h> +#include <tqpair.h> +#include <tqdir.h> class KProgress; -class QLabel; +class TQLabel; class K3bDataItem; class K3bDirItem; class K3bEncodingConverter; @@ -34,24 +34,25 @@ class K3bDataDoc; class K3bDataUrlAddingDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: ~K3bDataUrlAddingDialog(); /** - * \return \see QDialog::exec() + * \return \see TQDialog::exec() */ static int addUrls( const KURL::List& urls, K3bDirItem* dir = 0, - QWidget* parent = 0 ); + TQWidget* tqparent = 0 ); - static int moveItems( const QValueList<K3bDataItem*>& items, K3bDirItem* dir, - QWidget* parent = 0 ); + static int moveItems( const TQValueList<K3bDataItem*>& items, K3bDirItem* dir, + TQWidget* tqparent = 0 ); - static int copyItems( const QValueList<K3bDataItem*>& items, K3bDirItem* dir, - QWidget* parent = 0 ); + static int copyItems( const TQValueList<K3bDataItem*>& items, K3bDirItem* dir, + TQWidget* tqparent = 0 ); - static int copyMoveItems( const QValueList<K3bDataItem*>& items, K3bDirItem* dir, - QWidget* parent, bool copy ); + static int copyMoveItems( const TQValueList<K3bDataItem*>& items, K3bDirItem* dir, + TQWidget* tqparent, bool copy ); private slots: void slotAddUrls(); @@ -61,26 +62,26 @@ class K3bDataUrlAddingDialog : public KDialogBase void updateProgress(); private: - K3bDataUrlAddingDialog( K3bDataDoc* doc, QWidget* parent = 0, const char* name = 0 ); + K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); - bool getNewName( const QString& oldName, K3bDirItem* dir, QString& newName ); + bool getNewName( const TQString& oldName, K3bDirItem* dir, TQString& newName ); bool addHiddenFiles(); bool addSystemFiles(); - QString resultMessage() const; + TQString resultMessage() const; KProgress* m_progressWidget; - QLabel* m_infoLabel; - QLabel* m_counterLabel; + TQLabel* m_infoLabel; + TQLabel* m_counterLabel; K3bEncodingConverter* m_encodingConverter; KURL::List m_urls; - QValueList< QPair<KURL, K3bDirItem*> > m_urlQueue; + TQValueList< TQPair<KURL, K3bDirItem*> > m_urlQueue; - QValueList< QPair<K3bDataItem*, K3bDirItem*> > m_items; + TQValueList< TQPair<K3bDataItem*, K3bDirItem*> > m_items; - QValueList<KURL> m_dirSizeQueue; + TQValueList<KURL> m_dirSizeQueue; bool m_bExistingItemsReplaceAll; bool m_bExistingItemsIgnoreAll; @@ -89,12 +90,12 @@ class K3bDataUrlAddingDialog : public KDialogBase int m_iAddHiddenFiles; int m_iAddSystemFiles; - QStringList m_unreadableFiles; - QStringList m_notFoundFiles; - QStringList m_nonLocalFiles; - QStringList m_tooBigFiles; - QStringList m_mkisofsLimitationRenamedFiles; - QStringList m_invalidFilenameEncodingFiles; + TQStringList m_unreadableFiles; + TQStringList m_notFoundFiles; + TQStringList m_nonLocalFiles; + TQStringList m_tooBigFiles; + TQStringList m_mkisofsLimitationRenamedFiles; + TQStringList m_invalidFilenameEncodingFiles; bool m_bCanceled; diff --git a/src/projects/k3bdataview.cpp b/src/projects/k3bdataview.cpp index 9539b5c..f4d9749 100644 --- a/src/projects/k3bdataview.cpp +++ b/src/projects/k3bdataview.cpp @@ -41,47 +41,47 @@ #include <kio/job.h> #include <kdialogbase.h> -#include <qpixmap.h> -#include <qsplitter.h> -#include <qlayout.h> -#include <qdragobject.h> -#include <qheader.h> -#include <qptrlist.h> -#include <qlineedit.h> +#include <tqpixmap.h> +#include <tqsplitter.h> +#include <tqlayout.h> +#include <tqdragobject.h> +#include <tqheader.h> +#include <tqptrlist.h> +#include <tqlineedit.h> #include <assert.h> #include <kdebug.h> -K3bDataView::K3bDataView(K3bDataDoc* doc, QWidget *parent, const char *name ) - : K3bView(doc, parent,name) +K3bDataView::K3bDataView(K3bDataDoc* doc, TQWidget *tqparent, const char *name ) + : K3bView(doc, tqparent,name) { m_doc = doc; // --- setup GUI --------------------------------------------------- - QSplitter* mainSplitter = new QSplitter( this ); + TQSplitter* mainSplitter = new TQSplitter( this ); m_dataDirTree = new K3bDataDirTreeView( this, doc, mainSplitter ); m_dataFileView = new K3bDataFileView( this, m_dataDirTree, doc, mainSplitter ); m_dataDirTree->setFileView( m_dataFileView ); setMainWidget( mainSplitter ); - connect( m_dataFileView, SIGNAL(dirSelected(K3bDirItem*)), - m_dataDirTree, SLOT(setCurrentDir(K3bDirItem*)) ); - connect( m_doc, SIGNAL(changed()), this, SLOT(slotDocChanged()) ); + connect( m_dataFileView, TQT_SIGNAL(dirSelected(K3bDirItem*)), + m_dataDirTree, TQT_SLOT(setCurrentDir(K3bDirItem*)) ); + connect( m_doc, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotDocChanged()) ); m_dataDirTree->checkForNewItems(); m_dataFileView->checkForNewItems(); // the data actions - KAction* actionImportSession = new KAction(i18n("&Import Session..."), "gear", 0, this, SLOT(importSession()), + KAction* actionImportSession = new KAction(i18n("&Import Session..."), "gear", 0, TQT_TQOBJECT(this), TQT_SLOT(importSession()), actionCollection(), "project_data_import_session" ); - KAction* actionClearSession = new KAction(i18n("&Clear Imported Session"), "gear", 0, this, - SLOT(clearImportedSession()), actionCollection(), + KAction* actionClearSession = new KAction(i18n("&Clear Imported Session"), "gear", 0, TQT_TQOBJECT(this), + TQT_SLOT(clearImportedSession()), actionCollection(), "project_data_clear_imported_session" ); - KAction* actionEditBootImages = new KAction(i18n("&Edit Boot Images..."), "cdtrack", 0, this, - SLOT(editBootImages()), actionCollection(), + KAction* actionEditBootImages = new KAction(i18n("&Edit Boot Images..."), "cdtrack", 0, TQT_TQOBJECT(this), + TQT_SLOT(editBootImages()), actionCollection(), "project_data_edit_boot_images" ); actionImportSession->setToolTip( i18n("Import a previously burned session into the current project") ); @@ -92,21 +92,21 @@ K3bDataView::K3bDataView(K3bDataDoc* doc, QWidget *parent, const char *name ) toolBox()->addButton( actionClearSession ); toolBox()->addButton( actionEditBootImages ); toolBox()->addSeparator(); - toolBox()->addButton( m_dataFileView->actionCollection()->action("parent_dir") ); + toolBox()->addButton( m_dataFileView->actionCollection()->action("tqparent_dir") ); toolBox()->addSeparator(); addPluginButtons( K3bProjectPlugin::DATA_CD ); toolBox()->addStretch(); - m_volumeIDEdit = new QLineEdit( doc->isoOptions().volumeID(), toolBox() ); - m_volumeIDEdit->setValidator( new K3bLatin1Validator( m_volumeIDEdit ) ); + m_volumeIDEdit = new TQLineEdit( doc->isoOptions().volumeID(), toolBox() ); + m_volumeIDEdit->setValidator( new K3bLatin1Validator( TQT_TQOBJECT(m_volumeIDEdit) ) ); toolBox()->addLabel( i18n("Volume Name:") ); toolBox()->addSpacing(); toolBox()->addWidget( m_volumeIDEdit ); - connect( m_volumeIDEdit, SIGNAL(textChanged(const QString&)), + connect( m_volumeIDEdit, TQT_SIGNAL(textChanged(const TQString&)), m_doc, - SLOT(setVolumeID(const QString&)) ); + TQT_SLOT(setVolumeID(const TQString&)) ); // this is just for testing (or not?) // most likely every project type will have it's rc file in the future @@ -156,9 +156,9 @@ void K3bDataView::editBootImages() } -K3bProjectBurnDialog* K3bDataView::newBurnDialog( QWidget* parent, const char* name ) +K3bProjectBurnDialog* K3bDataView::newBurnDialog( TQWidget* tqparent, const char* name ) { - return new K3bDataBurnDialog( m_doc, parent, name, true ); + return new K3bDataBurnDialog( m_doc, tqparent, name, true ); } @@ -170,7 +170,7 @@ void K3bDataView::slotBurn() if( m_doc->sessionImported() && m_doc->burningSize() == 0 || m_doc->root()->numFiles() == 0 ) { KMessageBox::information( this, i18n("Please add files to your project first."), - i18n("No Data to Burn"), QString::null, false ); + i18n("No Data to Burn"), TQString(), false ); } else { K3bProjectBurnDialog* dlg = newBurnDialog( this ); diff --git a/src/projects/k3bdataview.h b/src/projects/k3bdataview.h index bb9154e..ea2a6a1 100644 --- a/src/projects/k3bdataview.h +++ b/src/projects/k3bdataview.h @@ -25,7 +25,7 @@ class K3bFileItem; class K3bDirItem; class K3bDataDirTreeView; class K3bDataFileView; -class QLineEdit; +class TQLineEdit; namespace KIO { @@ -43,9 +43,10 @@ namespace K3bDevice { class K3bDataView : public K3bView { Q_OBJECT + TQ_OBJECT public: - K3bDataView(K3bDataDoc* doc, QWidget *parent=0, const char *name=0); + K3bDataView(K3bDataDoc* doc, TQWidget *tqparent=0, const char *name=0); virtual ~K3bDataView(); K3bDirItem* currentDir() const; @@ -63,9 +64,9 @@ class K3bDataView : public K3bView protected: K3bDataDirTreeView* m_dataDirTree; K3bDataFileView* m_dataFileView; - QLineEdit* m_volumeIDEdit; + TQLineEdit* m_volumeIDEdit; - virtual K3bProjectBurnDialog* newBurnDialog( QWidget* parent = 0, const char* name = 0 ); + virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); private: K3bDataDoc* m_doc; diff --git a/src/projects/k3bdataviewitem.cpp b/src/projects/k3bdataviewitem.cpp index 78c044d..f200e55 100644 --- a/src/projects/k3bdataviewitem.cpp +++ b/src/projects/k3bdataviewitem.cpp @@ -30,20 +30,20 @@ #include <kpixmapeffect.h> #include <kpixmap.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qfileinfo.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqfileinfo.h> -K3bDataViewItem::K3bDataViewItem( K3bDataItem* item, QListView* parent ) - : K3bListViewItem( parent ), +K3bDataViewItem::K3bDataViewItem( K3bDataItem* item, TQListView* tqparent ) + : K3bListViewItem( tqparent ), m_dataItem(item) { init(); } -K3bDataViewItem::K3bDataViewItem( K3bDataItem* item, QListViewItem* parent ) - : K3bListViewItem( parent ), +K3bDataViewItem::K3bDataViewItem( K3bDataItem* item, TQListViewItem* tqparent ) + : K3bListViewItem( tqparent ), m_dataItem(item) { init(); @@ -56,36 +56,36 @@ K3bDataViewItem::~K3bDataViewItem() void K3bDataViewItem::init() { setEditor( 0, LINE ); - static QValidator* s_validator = K3bValidators::iso9660Validator(); + static TQValidator* s_validator = K3bValidators::iso9660Validator(); setValidator( 0, s_validator ); } -void K3bDataViewItem::paintCell( QPainter* p, const QColorGroup& cg, int column, int width, int align ) +void K3bDataViewItem::paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int align ) { - QColorGroup _cg = cg; + TQColorGroup _cg = cg; if( !dataItem()->isRemoveable() && dataItem()->doc()->root() != dataItem() ) { - _cg.setColor( QColorGroup::Text, listView()->palette().disabled().foreground() ); + _cg.setColor( TQColorGroup::Text, listView()->tqpalette().disabled().foreground() ); } if( column == 0 ) { - QFontMetrics fm = p->fontMetrics(); + TQFontMetrics fm = p->fontMetrics(); if( dataItem()->hideOnRockRidge() ) { - int tw = QMAX( fm.width( "rr" ) + 2*listView()->itemMargin(), height() ); - p->fillRect( width-tw, 0, tw, height(), isSelected() ? _cg.highlight() : _cg.brush(QColorGroup::Base) ); + int tw = TQMAX( fm.width( "rr" ) + 2*listView()->itemMargin(), height() ); + p->fillRect( width-tw, 0, tw, height(), isSelected() ? _cg.highlight() : _cg.brush(TQColorGroup::Base) ); p->setPen( isSelected() ? _cg.highlightedText() : red ); p->drawEllipse( width-tw, 0, tw, height() ); - p->drawText( width-tw, 0, tw, height(), Qt::AlignCenter, "rr" ); + p->drawText( width-tw, 0, tw, height(), TQt::AlignCenter, "rr" ); width -= tw; } if( dataItem()->hideOnJoliet() ) { - int tw = QMAX( fm.width( "j" ) + 2*listView()->itemMargin(), height() ); - p->fillRect( width-tw, 0, tw, height(), isSelected() ? _cg.highlight() : _cg.brush(QColorGroup::Base) ); + int tw = TQMAX( fm.width( "j" ) + 2*listView()->itemMargin(), height() ); + p->fillRect( width-tw, 0, tw, height(), isSelected() ? _cg.highlight() : _cg.brush(TQColorGroup::Base) ); p->setPen( isSelected() ? _cg.highlightedText() : blue ); p->drawEllipse( width-tw, 0, tw, height() ); - p->drawText( width-tw, 0, tw, height(), Qt::AlignCenter, "j" ); + p->drawText( width-tw, 0, tw, height(), TQt::AlignCenter, "j" ); width -= tw; } } @@ -95,7 +95,7 @@ void K3bDataViewItem::paintCell( QPainter* p, const QColorGroup& cg, int column, dataItem()->doc()->isoOptions().createRockRidge() && !dataItem()->isValid() ) { // paint the link in red - _cg.setColor( QColorGroup::Text, Qt::red ); + _cg.setColor( TQColorGroup::Text, TQt::red ); } } } @@ -104,7 +104,7 @@ void K3bDataViewItem::paintCell( QPainter* p, const QColorGroup& cg, int column, } -void K3bDataViewItem::setText( int col, const QString& text ) +void K3bDataViewItem::setText( int col, const TQString& text ) { if( col == 0 && dataItem()->isRenameable() ) { dataItem()->setK3bName( text ); @@ -113,37 +113,37 @@ void K3bDataViewItem::setText( int col, const QString& text ) } -QString K3bDataViewItem::key( int col, bool a ) const +TQString K3bDataViewItem::key( int col, bool a ) const { if( col == 2 ) { // to have correct sorting we need to justify the size in bytes // 100 TB should be enough for the next year... ;-) if( a ) - return ( dataItem()->isDir() ? QString("0") : QString("1") ) - + QString::number( dataItem()->size() ).rightJustify( 16, '0' ); + return ( dataItem()->isDir() ? TQString("0") : TQString("1") ) + + TQString::number( dataItem()->size() ).rightJustify( 16, '0' ); else - return ( dataItem()->isDir() ? QString("1") : QString("0") ) - + QString::number( dataItem()->size() ).rightJustify( 16, '0' ); + return ( dataItem()->isDir() ? TQString("1") : TQString("0") ) + + TQString::number( dataItem()->size() ).rightJustify( 16, '0' ); } if( a ) - return ( dataItem()->isDir() ? QString("0") : QString("1") ) + text(col); + return ( dataItem()->isDir() ? TQString("0") : TQString("1") ) + text(col); else - return ( dataItem()->isDir() ? QString("1") : QString("0") ) + text(col); + return ( dataItem()->isDir() ? TQString("1") : TQString("0") ) + text(col); } -K3bDataDirViewItem::K3bDataDirViewItem( K3bDirItem* dir, QListView* parent ) - : K3bDataViewItem( dir, parent ) +K3bDataDirViewItem::K3bDataDirViewItem( K3bDirItem* dir, TQListView* tqparent ) + : K3bDataViewItem( dir, tqparent ) { m_dirItem = dir; setPixmap( 0, dir->depth() > 7 ? SmallIcon( "folder_red" ) : SmallIcon( "folder" ) ); } -K3bDataDirViewItem::K3bDataDirViewItem( K3bDirItem* dir, QListViewItem* parent ) - : K3bDataViewItem( dir, parent ) +K3bDataDirViewItem::K3bDataDirViewItem( K3bDirItem* dir, TQListViewItem* tqparent ) + : K3bDataViewItem( dir, tqparent ) { m_dirItem = dir; setPixmap( 0, dir->depth() > 7 ? SmallIcon( "folder_red" ) : SmallIcon( "folder" ) ); @@ -161,7 +161,7 @@ void K3bDataDirViewItem::dragEntered() } -QString K3bDataDirViewItem::text( int index ) const +TQString K3bDataDirViewItem::text( int index ) const { switch( index ) { case 0: @@ -182,22 +182,22 @@ void K3bDataDirViewItem::highlightIcon( bool b ) m_pixmap = *pixmap(0); if( b ) - setPixmap( 0, KPixmapEffect::selectedPixmap( m_pixmap, listView()->colorGroup().highlight() ) ); + setPixmap( 0, KPixmapEffect::selectedPixmap( m_pixmap, listView()->tqcolorGroup().highlight() ) ); else setPixmap( 0, m_pixmap ); } -K3bDataFileViewItem::K3bDataFileViewItem( K3bFileItem* file, QListView* parent ) - : K3bDataViewItem( file, parent ) +K3bDataFileViewItem::K3bDataFileViewItem( K3bFileItem* file, TQListView* tqparent ) + : K3bDataViewItem( file, tqparent ) { init( file ); } -K3bDataFileViewItem::K3bDataFileViewItem( K3bFileItem* file, QListViewItem* parent ) - : K3bDataViewItem( file, parent ) +K3bDataFileViewItem::K3bDataFileViewItem( K3bFileItem* file, TQListViewItem* tqparent ) + : K3bDataViewItem( file, tqparent ) { init( file ); } @@ -216,19 +216,19 @@ void K3bDataFileViewItem::init( K3bFileItem* file ) } -QString K3bDataFileViewItem::text( int index ) const +TQString K3bDataFileViewItem::text( int index ) const { switch( index ) { case 0: return m_fileItem->k3bName(); case 1: { - QString comment = m_pMimeType->comment( KURL::fromPathOrURL(m_fileItem->localPath()), true ); + TQString comment = m_pMimeType->comment( KURL::fromPathOrURL(m_fileItem->localPath()), true ); if( comment.isEmpty() ) comment = m_pMimeType->name(); if( m_fileItem->isSymLink() ) - return i18n("Link to %1").arg(comment); + return i18n("Link to %1").tqarg(comment); else return comment; } @@ -238,15 +238,15 @@ QString K3bDataFileViewItem::text( int index ) const return m_fileItem->localPath(); case 4: { if( !m_fileItem->isSymLink() ) { - return QString::null; + return TQString(); } - QString s; + TQString s; if ( m_fileItem->doc()->isoOptions().followSymbolicLinks() ) { s = K3b::resolveLink( m_fileItem->localPath() ); } else { - s = QFileInfo( m_fileItem->localPath() ).readLink(); + s = TQFileInfo( m_fileItem->localPath() ).readLink(); } if( !m_fileItem->isValid() ) { @@ -262,8 +262,8 @@ QString K3bDataFileViewItem::text( int index ) const -K3bDataRootViewItem::K3bDataRootViewItem( K3bDataDoc* doc, QListView* parent ) - : K3bDataDirViewItem( doc->root(), parent ) +K3bDataRootViewItem::K3bDataRootViewItem( K3bDataDoc* doc, TQListView* tqparent ) + : K3bDataDirViewItem( doc->root(), tqparent ) { m_doc = doc; setPixmap( 0, SmallIcon( "cdrom_unmount" ) ); @@ -277,7 +277,7 @@ K3bDataRootViewItem::~K3bDataRootViewItem() } -QString K3bDataRootViewItem::text( int index ) const +TQString K3bDataRootViewItem::text( int index ) const { switch( index ) { case 0: @@ -288,7 +288,7 @@ QString K3bDataRootViewItem::text( int index ) const } -void K3bDataRootViewItem::setText( int col, const QString& text ) +void K3bDataRootViewItem::setText( int col, const TQString& text ) { if( col == 0 ) m_doc->setVolumeID( text ); @@ -297,13 +297,13 @@ void K3bDataRootViewItem::setText( int col, const QString& text ) } -K3bSpecialDataViewItem::K3bSpecialDataViewItem( K3bSpecialDataItem* item, QListView* parent ) - : K3bDataViewItem( item, parent ) +K3bSpecialDataViewItem::K3bSpecialDataViewItem( K3bSpecialDataItem* item, TQListView* tqparent ) + : K3bDataViewItem( item, tqparent ) { setPixmap( 0, SmallIcon("unknown") ); } -QString K3bSpecialDataViewItem::text( int col ) const +TQString K3bSpecialDataViewItem::text( int col ) const { switch( col ) { case 0: @@ -319,13 +319,13 @@ QString K3bSpecialDataViewItem::text( int col ) const -K3bSessionImportViewItem::K3bSessionImportViewItem( K3bSessionImportItem* item, QListView* parent ) - : K3bDataViewItem( item, parent ) +K3bSessionImportViewItem::K3bSessionImportViewItem( K3bSessionImportItem* item, TQListView* tqparent ) + : K3bDataViewItem( item, tqparent ) { setPixmap( 0, SmallIcon("unknown") ); } -QString K3bSessionImportViewItem::text( int col ) const +TQString K3bSessionImportViewItem::text( int col ) const { switch( col ) { case 0: diff --git a/src/projects/k3bdataviewitem.h b/src/projects/k3bdataviewitem.h index 60d68d2..ac95e98 100644 --- a/src/projects/k3bdataviewitem.h +++ b/src/projects/k3bdataviewitem.h @@ -26,28 +26,28 @@ class K3bDataDoc; class K3bSpecialDataItem; class K3bSessionImportItem; -class QPainter; -class QColorGroup; +class TQPainter; +class TQColorGroup; class K3bDataViewItem : public K3bListViewItem { public: - K3bDataViewItem( K3bDataItem*, QListView* parent ); - K3bDataViewItem( K3bDataItem*, QListViewItem* parent ); + K3bDataViewItem( K3bDataItem*, TQListView* tqparent ); + K3bDataViewItem( K3bDataItem*, TQListViewItem* tqparent ); virtual ~K3bDataViewItem(); virtual K3bDataItem* dataItem() const { return m_dataItem; } - void setText( int col, const QString& text ); + void setText( int col, const TQString& text ); /** * reimplemented to have directories always sorted before files */ - QString key( int, bool ) const; + TQString key( int, bool ) const; - virtual void paintCell( QPainter* p, const QColorGroup& cg, int column, int width, int align ); + virtual void paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int align ); private: void init(); @@ -59,11 +59,11 @@ class K3bDataViewItem : public K3bListViewItem class K3bDataDirViewItem : public K3bDataViewItem { public: - K3bDataDirViewItem( K3bDirItem* dir, QListView* parent ); - K3bDataDirViewItem( K3bDirItem* dir, QListViewItem* parent ); + K3bDataDirViewItem( K3bDirItem* dir, TQListView* tqparent ); + K3bDataDirViewItem( K3bDirItem* dir, TQListViewItem* tqparent ); ~K3bDataDirViewItem(); - virtual QString text( int ) const; + virtual TQString text( int ) const; K3bDirItem* dirItem() const { return m_dirItem; } @@ -74,18 +74,18 @@ class K3bDataDirViewItem : public K3bDataViewItem private: K3bDirItem* m_dirItem; - QPixmap m_pixmap; + TQPixmap m_pixmap; }; class K3bDataFileViewItem : public K3bDataViewItem { public: - K3bDataFileViewItem( K3bFileItem*, QListView* parent ); - K3bDataFileViewItem( K3bFileItem*, QListViewItem* parent ); + K3bDataFileViewItem( K3bFileItem*, TQListView* tqparent ); + K3bDataFileViewItem( K3bFileItem*, TQListViewItem* tqparent ); ~K3bDataFileViewItem() {} - QString text( int ) const; + TQString text( int ) const; K3bFileItem* fileItem() const { return m_fileItem; } @@ -102,13 +102,13 @@ class K3bDataFileViewItem : public K3bDataViewItem class K3bDataRootViewItem : public K3bDataDirViewItem { public: - K3bDataRootViewItem( K3bDataDoc*, QListView* parent ); + K3bDataRootViewItem( K3bDataDoc*, TQListView* tqparent ); ~K3bDataRootViewItem(); - QString text( int ) const; + TQString text( int ) const; - /** reimplemented from QListViewItem */ - void setText(int col, const QString& text ); + /** reimplemented from TQListViewItem */ + void setText(int col, const TQString& text ); private: K3bDataDoc* m_doc; @@ -118,18 +118,18 @@ class K3bDataRootViewItem : public K3bDataDirViewItem class K3bSpecialDataViewItem : public K3bDataViewItem { public: - K3bSpecialDataViewItem( K3bSpecialDataItem*, QListView* ); + K3bSpecialDataViewItem( K3bSpecialDataItem*, TQListView* ); - QString text( int ) const; + TQString text( int ) const; }; class K3bSessionImportViewItem : public K3bDataViewItem { public: - K3bSessionImportViewItem( K3bSessionImportItem*, QListView* ); + K3bSessionImportViewItem( K3bSessionImportItem*, TQListView* ); - QString text( int ) const; + TQString text( int ) const; }; #endif diff --git a/src/projects/k3bdatavolumedescwidget.cpp b/src/projects/k3bdatavolumedescwidget.cpp index 1edbc7b..be443a5 100644 --- a/src/projects/k3bdatavolumedescwidget.cpp +++ b/src/projects/k3bdatavolumedescwidget.cpp @@ -18,18 +18,18 @@ #include "k3bisooptions.h" #include <k3bvalidators.h> -#include <qlineedit.h> -#include <qspinbox.h> -#include <qlabel.h> -#include <qtoolbutton.h> +#include <tqlineedit.h> +#include <tqspinbox.h> +#include <tqlabel.h> +#include <tqtoolbutton.h> -K3bDataVolumeDescWidget::K3bDataVolumeDescWidget( QWidget* parent, const char* name ) - : base_K3bDataVolumeDescWidget( parent, name ) +K3bDataVolumeDescWidget::K3bDataVolumeDescWidget( TQWidget* tqparent, const char* name ) + : base_K3bDataVolumeDescWidget( tqparent, name ) { // the maximal number of characters that can be inserted are set in the ui file! - QValidator* isoValidator = new K3bLatin1Validator( this ); + TQValidator* isoValidator = new K3bLatin1Validator( TQT_TQOBJECT(this) ); m_editVolumeName->setValidator( isoValidator ); m_editVolumeSetName->setValidator( isoValidator ); @@ -38,8 +38,8 @@ K3bDataVolumeDescWidget::K3bDataVolumeDescWidget( QWidget* parent, const char* n m_editSystem->setValidator( isoValidator ); m_editApplication->setValidator( isoValidator ); - connect( m_spinVolumeSetSize, SIGNAL(valueChanged(int)), - this, SLOT(slotVolumeSetSizeChanged(int)) ); + connect( m_spinVolumeSetSize, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotVolumeSetSizeChanged(int)) ); // for now we hide the volume set size stuff since it's not working anymore in mkisofs 2.01a34 textLabel1->hide(); diff --git a/src/projects/k3bdatavolumedescwidget.h b/src/projects/k3bdatavolumedescwidget.h index 8b4a388..27102e2 100644 --- a/src/projects/k3bdatavolumedescwidget.h +++ b/src/projects/k3bdatavolumedescwidget.h @@ -25,9 +25,10 @@ class K3bIsoOptions; class K3bDataVolumeDescWidget : public base_K3bDataVolumeDescWidget { Q_OBJECT + TQ_OBJECT public: - K3bDataVolumeDescWidget( QWidget* parent = 0, const char* name = 0 ); + K3bDataVolumeDescWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bDataVolumeDescWidget(); void load( const K3bIsoOptions& ); diff --git a/src/projects/k3bdvdburndialog.cpp b/src/projects/k3bdvdburndialog.cpp index 873afbf..4654bb9 100644 --- a/src/projects/k3bdvdburndialog.cpp +++ b/src/projects/k3bdvdburndialog.cpp @@ -33,30 +33,30 @@ #include <kio/global.h> #include <kmessagebox.h> -#include <qlayout.h> -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> -#include <qspinbox.h> - - -K3bDvdBurnDialog::K3bDvdBurnDialog( K3bDvdDoc* doc, QWidget *parent, const char *name, bool modal ) - : K3bProjectBurnDialog( doc, parent, name, modal, true ), +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> +#include <tqspinbox.h> + + +K3bDvdBurnDialog::K3bDvdBurnDialog( K3bDvdDoc* doc, TQWidget *tqparent, const char *name, bool modal ) + : K3bProjectBurnDialog( doc, tqparent, name, modal, true ), m_doc( doc ) { prepareGui(); - setTitle( i18n("DVD Project"), i18n("Size: %1").arg( KIO::convertSize(doc->size()) ) ); + setTitle( i18n("DVD Project"), i18n("Size: %1").tqarg( KIO::convertSize(doc->size()) ) ); // for now we just put the verify checkbox on the main page... m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup ); m_optionGroupLayout->addWidget( m_checkVerify ); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); m_optionGroupLayout->addItem( spacer ); // create image settings tab @@ -69,7 +69,7 @@ K3bDvdBurnDialog::K3bDvdBurnDialog( K3bDvdDoc* doc, QWidget *parent, const char m_writerSelectionWidget->setWantedMediumState( K3bDevice::STATE_EMPTY|K3bDevice::STATE_INCOMPLETE ); - QString path = doc->tempDir(); + TQString path = doc->tempDir(); if( !path.isEmpty() ) { m_tempDirSelectionWidget->setTempPath( path ); } @@ -77,8 +77,8 @@ K3bDvdBurnDialog::K3bDvdBurnDialog( K3bDvdDoc* doc, QWidget *parent, const char m_tempDirSelectionWidget->setDefaultImageFileName( doc->isoOptions().volumeID() + ".iso" ); } - connect( m_imageSettingsWidget->m_editVolumeName, SIGNAL(textChanged(const QString&)), - m_tempDirSelectionWidget, SLOT(setDefaultImageFileName(const QString&)) ); + connect( m_imageSettingsWidget->m_editVolumeName, TQT_SIGNAL(textChanged(const TQString&)), + m_tempDirSelectionWidget, TQT_SLOT(setDefaultImageFileName(const TQString&)) ); } @@ -89,14 +89,14 @@ K3bDvdBurnDialog::~K3bDvdBurnDialog() void K3bDvdBurnDialog::setupSettingsTab() { - QWidget* frame = new QWidget( this ); - QGridLayout* frameLayout = new QGridLayout( frame ); + TQWidget* frame = new TQWidget( this ); + TQGridLayout* frameLayout = new TQGridLayout( frame ); frameLayout->setSpacing( spacingHint() ); frameLayout->setMargin( marginHint() ); // Multisession // //////////////////////////////////////////////////////////////////////// - QGroupBox* groupMultiSession = new QGroupBox( 1, Qt::Vertical, i18n("Multisession Mode"), frame ); + TQGroupBox* groupMultiSession = new TQGroupBox( 1, Qt::Vertical, i18n("Multisession Mode"), frame ); m_comboMultisession = new K3bDataMultiSessionCombobox( groupMultiSession ); frameLayout->addWidget( groupMultiSession, 0, 0 ); @@ -104,8 +104,8 @@ void K3bDvdBurnDialog::setupSettingsTab() addPage( frame, i18n("Misc") ); - connect( m_comboMultisession, SIGNAL(activated(int)), - this, SLOT(slotMultiSessionModeChanged()) ); + connect( m_comboMultisession, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotMultiSessionModeChanged()) ); } @@ -277,17 +277,17 @@ void K3bDvdBurnDialog::slotStartClicked() { if( m_checkOnlyCreateImage->isChecked() || m_checkCacheImage->isChecked() ) { - QFileInfo fi( m_tempDirSelectionWidget->tempPath() ); + TQFileInfo fi( m_tempDirSelectionWidget->tempPath() ); if( fi.isDir() ) m_tempDirSelectionWidget->setTempPath( fi.filePath() + "/image.iso" ); - if( QFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { + if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { if( KMessageBox::warningContinueCancel( this, - i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()), + i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()), i18n("File Exists"), i18n("Overwrite") ) == KMessageBox::Continue ) { // delete the file here to avoid problems with free space in K3bProjectBurnDialog::slotStartClicked - QFile::remove( m_tempDirSelectionWidget->tempPath() ); + TQFile::remove( m_tempDirSelectionWidget->tempPath() ); } else return; diff --git a/src/projects/k3bdvdburndialog.h b/src/projects/k3bdvdburndialog.h index deb9620..3400c7d 100644 --- a/src/projects/k3bdvdburndialog.h +++ b/src/projects/k3bdvdburndialog.h @@ -22,19 +22,20 @@ class K3bDvdDoc; class K3bDataImageSettingsWidget; -class QGroupBox; -class QRadioButton; -class QButtonGroup; -class QCheckBox; +class TQGroupBox; +class TQRadioButton; +class TQButtonGroup; +class TQCheckBox; class K3bDataMultiSessionCombobox; class K3bDvdBurnDialog : public K3bProjectBurnDialog { Q_OBJECT + TQ_OBJECT public: - K3bDvdBurnDialog( K3bDvdDoc*, QWidget *parent = 0, const char *name = 0, bool modal = true ); + K3bDvdBurnDialog( K3bDvdDoc*, TQWidget *tqparent = 0, const char *name = 0, bool modal = true ); ~K3bDvdBurnDialog(); protected slots: @@ -61,7 +62,7 @@ class K3bDvdBurnDialog : public K3bProjectBurnDialog K3bDataMultiSessionCombobox* m_comboMultisession; // --------------------------------------------- - QCheckBox* m_checkVerify; + TQCheckBox* m_checkVerify; K3bDvdDoc* m_doc; }; diff --git a/src/projects/k3bdvdview.cpp b/src/projects/k3bdvdview.cpp index 512ec4b..dc5f67a 100644 --- a/src/projects/k3bdvdview.cpp +++ b/src/projects/k3bdvdview.cpp @@ -22,8 +22,8 @@ #include <klocale.h> -K3bDvdView::K3bDvdView( K3bDvdDoc* doc, QWidget *parent, const char *name ) - : K3bDataView( doc, parent, name ) +K3bDvdView::K3bDvdView( K3bDvdDoc* doc, TQWidget *tqparent, const char *name ) + : K3bDataView( doc, tqparent, name ) { m_doc = doc; @@ -40,9 +40,9 @@ K3bDvdView::~K3bDvdView() } -K3bProjectBurnDialog* K3bDvdView::newBurnDialog( QWidget* parent, const char* name ) +K3bProjectBurnDialog* K3bDvdView::newBurnDialog( TQWidget* tqparent, const char* name ) { - return new K3bDvdBurnDialog( m_doc, parent, name, true ); + return new K3bDvdBurnDialog( m_doc, tqparent, name, true ); } #include "k3bdvdview.moc" diff --git a/src/projects/k3bdvdview.h b/src/projects/k3bdvdview.h index d9f30f3..1072cc2 100644 --- a/src/projects/k3bdvdview.h +++ b/src/projects/k3bdvdview.h @@ -25,13 +25,14 @@ class K3bDvdDoc; class K3bDvdView : public K3bDataView { Q_OBJECT + TQ_OBJECT public: - K3bDvdView( K3bDvdDoc* doc, QWidget *parent = 0, const char *name = 0 ); + K3bDvdView( K3bDvdDoc* doc, TQWidget *tqparent = 0, const char *name = 0 ); ~K3bDvdView(); protected: - virtual K3bProjectBurnDialog* newBurnDialog( QWidget* parent = 0, const char* name = 0 ); + virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); private: K3bDvdDoc* m_doc; diff --git a/src/projects/k3bencodingconverter.cpp b/src/projects/k3bencodingconverter.cpp index 460abbe..38e219e 100644 --- a/src/projects/k3bencodingconverter.cpp +++ b/src/projects/k3bencodingconverter.cpp @@ -17,8 +17,8 @@ #include "k3bencodingconverter.h" -#include <qwidget.h> -#include <qlayout.h> +#include <tqwidget.h> +#include <tqlayout.h> #include <kdebug.h> @@ -32,8 +32,8 @@ class K3bEncodingConverter::Private { public: iconv_t ic; - QString localEncoding; - QString lastEncoding; + TQString localEncoding; + TQString lastEncoding; }; @@ -42,7 +42,7 @@ K3bEncodingConverter::K3bEncodingConverter() d = new Private; #ifdef HAVE_ICONV_H char* codec = nl_langinfo( CODESET ); - d->localEncoding = QString::fromLocal8Bit( codec ); + d->localEncoding = TQString::fromLocal8Bit( codec ); kdDebug() << "(K3bDataUrlAddingDialog) using locale codec: " << codec << endl; d->ic = ::iconv_open( "UCS-2BE", codec ); #endif @@ -58,14 +58,14 @@ K3bEncodingConverter::~K3bEncodingConverter() } -bool K3bEncodingConverter::encodedLocally( const QCString& s ) +bool K3bEncodingConverter::encodedLocally( const TQCString& s ) { #ifdef HAVE_ICONV_H - QCString utf8Encoded( s.length()*2 ); + TQCString utf8Encoded( s.length()*2 ); #if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) const char* in = s.data(); #else - char* in = s.data(); + char* in = const_cast<char*>(s.data()); #endif char* out = utf8Encoded.data(); size_t inSize = s.length(); @@ -77,7 +77,7 @@ bool K3bEncodingConverter::encodedLocally( const QCString& s ) } -bool K3bEncodingConverter::fixEncoding( const QCString& s, QCString& result, QWidget* parent, bool cache ) +bool K3bEncodingConverter::fixEncoding( const TQCString& s, TQCString& result, TQWidget* tqparent, bool cache ) { #ifdef IMPLEMENT_THIS_METHOD // HAVE_ICONV_H if( !d->lastEncoding.isEmpty() ) { @@ -96,14 +96,14 @@ bool K3bEncodingConverter::fixEncoding( const QCString& s, QCString& result, QWi } else - d->lastEncoding = QString::null; + d->lastEncoding = TQString(); #else return false; #endif } -bool K3bEncodingConverter::convert( const QCString& s, QCString& result, const QString& from, const QString& to ) +bool K3bEncodingConverter::convert( const TQCString& s, TQCString& result, const TQString& from, const TQString& to ) { bool r = false; @@ -114,7 +114,7 @@ bool K3bEncodingConverter::convert( const QCString& s, QCString& result, const Q #if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) const char* in = s.data(); #else - char* in = s.data(); + char* in = const_cast<char*>(s.data()); #endif char* out = result.data(); size_t inSize = s.length(); diff --git a/src/projects/k3bencodingconverter.h b/src/projects/k3bencodingconverter.h index e40003c..c88f5be 100644 --- a/src/projects/k3bencodingconverter.h +++ b/src/projects/k3bencodingconverter.h @@ -16,10 +16,10 @@ #ifndef _K3B_ENCODING_CONVERTER_H_ #define _K3B_ENCODING_CONVERTER_H_ -#include <qcstring.h> -#include <qstring.h> +#include <tqcstring.h> +#include <tqstring.h> -class QWidget; +class TQWidget; class K3bEncodingConverter { @@ -32,7 +32,7 @@ class K3bEncodingConverter * * \return True if the string is encoded in the local encoding. */ - bool encodedLocally( const QCString& ); + bool encodedLocally( const TQCString& ); /** * Tries to fix the encoding of a string to fit the local @@ -41,16 +41,16 @@ class K3bEncodingConverter * the proper encoding based on example conversions. * * \param s The string to be fixed. - * \param parent The parent widget to be used when showing the encoding selection dialog. + * \param tqparent The tqparent widget to be used when showing the encoding selection dialog. * \param cacheEncoding If true the codeset used for successful conversion is cached and * reused for the next call to fixEncoding. * * \return True if the conversion was successful. */ - bool fixEncoding( const QCString& s, QCString& result, QWidget* parent = 0, bool cacheEncoding = true ); + bool fixEncoding( const TQCString& s, TQCString& result, TQWidget* tqparent = 0, bool cacheEncoding = true ); private: - bool convert( const QCString& s, QCString& result, const QString& from, const QString& to ); + bool convert( const TQCString& s, TQCString& result, const TQString& from, const TQString& to ); class Private; Private* d; diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp index 2d39bc7..b52782c 100644 --- a/src/projects/k3bfillstatusdisplay.cpp +++ b/src/projects/k3bfillstatusdisplay.cpp @@ -26,18 +26,18 @@ #include <k3bradioaction.h> #include <k3bmediacache.h> -#include <qevent.h> -#include <qpainter.h> -#include <qcolor.h> -#include <qrect.h> -#include <qfont.h> -#include <qfontmetrics.h> -#include <qvalidator.h> -#include <qtoolbutton.h> -#include <qtooltip.h> -#include <qlayout.h> -#include <qwhatsthis.h> -#include <qtimer.h> +#include <tqevent.h> +#include <tqpainter.h> +#include <tqcolor.h> +#include <tqrect.h> +#include <tqfont.h> +#include <tqfontmetrics.h> +#include <tqvalidator.h> +#include <tqtoolbutton.h> +#include <tqtooltip.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> +#include <tqtimer.h> #include <kaction.h> #include <kpopupmenu.h> @@ -67,12 +67,12 @@ public: }; -K3bFillStatusDisplayWidget::K3bFillStatusDisplayWidget( K3bDoc* doc, QWidget* parent ) - : QWidget( parent, 0, WRepaintNoErase ) +K3bFillStatusDisplayWidget::K3bFillStatusDisplayWidget( K3bDoc* doc, TQWidget* tqparent ) + : TQWidget( tqparent, 0, WRepaintNoErase ) { d = new Private(); d->doc = doc; - setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Preferred ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ) ); } @@ -102,35 +102,35 @@ void K3bFillStatusDisplayWidget::setCdSize( const K3b::Msf& size ) } -QSize K3bFillStatusDisplayWidget::sizeHint() const +TQSize K3bFillStatusDisplayWidget::tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } -QSize K3bFillStatusDisplayWidget::minimumSizeHint() const +TQSize K3bFillStatusDisplayWidget::tqminimumSizeHint() const { int margin = 2; - QFontMetrics fm( font() ); - return QSize( -1, fm.height() + 2 * margin ); + TQFontMetrics fm( font() ); + return TQSize( -1, fm.height() + 2 * margin ); } -void K3bFillStatusDisplayWidget::mousePressEvent( QMouseEvent* e ) +void K3bFillStatusDisplayWidget::mousePressEvent( TQMouseEvent* e ) { if( e->button() == Qt::RightButton ) emit contextMenu( e->globalPos() ); } -void K3bFillStatusDisplayWidget::paintEvent( QPaintEvent* ) +void K3bFillStatusDisplayWidget::paintEvent( TQPaintEvent* ) { // double buffer - QPixmap buffer( size() ); - buffer.fill( colorGroup().base() ); - QPainter p; - p.begin( &buffer, this ); - p.setPen( Qt::black ); // we use a fixed bar color (which is not very nice btw, so we also fix the text color) + TQPixmap buffer( size() ); + buffer.fill( tqcolorGroup().base() ); + TQPainter p; + p.tqbegin( &buffer, TQT_TQOBJECT(this) ); + p.setPen( TQt::black ); // we use a fixed bar color (which is not very nice btw, so we also fix the text color) long long docSize; long long cdSize; @@ -152,19 +152,19 @@ void K3bFillStatusDisplayWidget::paintEvent( QPaintEvent* ) // so split width() in maxValue pieces double one = (double)rect().width() / (double)maxValue; - QRect crect( rect() ); + TQRect crect( rect() ); crect.setWidth( (int)(one*(double)docSize) ); p.setClipping(true); p.setClipRect(crect); - p.fillRect( crect, Qt::green ); + p.fillRect( crect, TQt::green ); - QRect oversizeRect(crect); + TQRect oversizeRect(crect); // draw yellow if cdSize - tolerance < docSize if( docSize > cdSize - tolerance ) { oversizeRect.setLeft( oversizeRect.left() + (int)(one * (cdSize - tolerance)) ); - p.fillRect( oversizeRect, Qt::yellow ); + p.fillRect( oversizeRect, TQt::yellow ); KPixmap pix; pix.resize( rect().height()*2, rect().height() ); KPixmapEffect::gradient( pix, green, yellow, KPixmapEffect::HorizontalGradient, 0 ); @@ -174,7 +174,7 @@ void K3bFillStatusDisplayWidget::paintEvent( QPaintEvent* ) // draw red if docSize > cdSize + tolerance if( docSize > cdSize + tolerance ) { oversizeRect.setLeft( oversizeRect.left() + (int)(one * tolerance*2) ); - p.fillRect( oversizeRect, Qt::red ); + p.fillRect( oversizeRect, TQt::red ); KPixmap pix; pix.resize( rect().height()*2, rect().height() ); KPixmapEffect::gradient( pix, yellow, red, KPixmapEffect::HorizontalGradient, 0 ); @@ -190,25 +190,25 @@ void K3bFillStatusDisplayWidget::paintEvent( QPaintEvent* ) // first we determine the text to display // ==================================================================================== - QString docSizeText; + TQString docSizeText; if( d->showTime ) docSizeText = d->doc->length().toString(false) + " " + i18n("min"); else docSizeText = KIO::convertSize( d->doc->size() ); - QString overSizeText; + TQString overSizeText; if( d->cdSize.mode1Bytes() >= d->doc->size() ) overSizeText = i18n("Available: %1 of %2") - .arg( d->showTime - ? i18n("%1 min").arg((K3b::Msf( cdSize*60*75 ) - d->doc->length()).toString(false)) - : KIO::convertSize( QMAX( (cdSize * 1024LL * 1024LL) - (long long)d->doc->size(), 0LL ) ) ) - .arg( d->showTime - ? i18n("%1 min").arg(K3b::Msf( cdSize*60*75 ).toString(false)) + .tqarg( d->showTime + ? i18n("%1 min").tqarg((K3b::Msf( cdSize*60*75 ) - d->doc->length()).toString(false)) + : KIO::convertSize( TQMAX( (cdSize * 1024LL * 1024LL) - (long long)d->doc->size(), 0LL ) ) ) + .tqarg( d->showTime + ? i18n("%1 min").tqarg(K3b::Msf( cdSize*60*75 ).toString(false)) : KIO::convertSizeFromKB( cdSize * 1024 ) ); else overSizeText = i18n("Capacity exceeded by %1") - .arg( d->showTime - ? i18n("%1 min").arg( (d->doc->length() - K3b::Msf( cdSize*60*75 ) ).toString(false)) + .tqarg( d->showTime + ? i18n("%1 min").tqarg( (d->doc->length() - K3b::Msf( cdSize*60*75 ) ).toString(false)) : KIO::convertSize( (long long)d->doc->size() - (cdSize * 1024LL * 1024LL) ) ); // ==================================================================================== @@ -234,18 +234,18 @@ void K3bFillStatusDisplayWidget::paintEvent( QPaintEvent* ) // make sure the text does not cross the medium size marker if( docSizeTextPos <= mediumSizeMarkerPos && mediumSizeMarkerPos <= docSizeTextPos + docSizeTextLength ) - docSizeTextPos = QMAX( crect.left() + 5, mediumSizeMarkerPos - docSizeTextLength - 5 ); + docSizeTextPos = TQMAX( crect.left() + 5, mediumSizeMarkerPos - docSizeTextLength - 5 ); } // ==================================================================================== // draw the over size text // ==================================================================================== - QFont fnt(font()); - fnt.setPointSize( QMAX( 8, fnt.pointSize()-4 ) ); + TQFont fnt(font()); + fnt.setPointSize( TQMAX( 8, fnt.pointSize()-4 ) ); fnt.setBold(false); - QRect overSizeTextRect( rect() ); - int overSizeTextLength = QFontMetrics(fnt).width(overSizeText); + TQRect overSizeTextRect( rect() ); + int overSizeTextLength = TQFontMetrics(fnt).width(overSizeText); if( overSizeTextLength + 5 > overSizeTextRect.width() - (int)(one*cdSize) ) { // we don't have enough space on the right, so we paint to the left of the line overSizeTextRect.setLeft( (int)(one*cdSize) - overSizeTextLength - 5 ); @@ -256,14 +256,14 @@ void K3bFillStatusDisplayWidget::paintEvent( QPaintEvent* ) // make sure the two text do not overlap (this does not cover all cases though) if( overSizeTextRect.left() < docSizeTextPos + docSizeTextLength ) - docSizeTextPos = QMAX( crect.left() + 5, QMIN( overSizeTextRect.left() - docSizeTextLength - 5, mediumSizeMarkerPos - docSizeTextLength - 5 ) ); + docSizeTextPos = TQMAX( crect.left() + 5, TQMIN( overSizeTextRect.left() - docSizeTextLength - 5, mediumSizeMarkerPos - docSizeTextLength - 5 ) ); - QRect docTextRect( rect() ); + TQRect docTextRect( rect() ); docTextRect.setLeft( docSizeTextPos ); - p.drawText( docTextRect, Qt::AlignLeft | Qt::AlignVCenter, docSizeText ); + p.drawText( docTextRect, TQt::AlignLeft | TQt::AlignVCenter, docSizeText ); p.setFont(fnt); - p.drawText( overSizeTextRect, Qt::AlignLeft | Qt::AlignVCenter, overSizeText ); + p.drawText( overSizeTextRect, TQt::AlignLeft | TQt::AlignVCenter, overSizeText ); // ==================================================================================== p.end(); @@ -276,16 +276,16 @@ void K3bFillStatusDisplayWidget::paintEvent( QPaintEvent* ) // ---------------------------------------------------------------------------------------------------- -class K3bFillStatusDisplay::ToolTip : public QToolTip +class K3bFillStatusDisplay::ToolTip : public TQToolTip { public: - ToolTip( K3bDoc* doc, QWidget* parent ) - : QToolTip( parent, 0 ), + ToolTip( K3bDoc* doc, TQWidget* tqparent ) + : TQToolTip( tqparent, 0 ), m_doc(doc) { } - void maybeTip( const QPoint& ) { - tip( parentWidget()->rect(), + void maybeTip( const TQPoint& ) { + tip( tqparentWidget()->rect(), KIO::convertSize( m_doc->size() ) + " (" + KGlobal::locale()->formatNumber( m_doc->size(), 0 ) + "), " + m_doc->length().toString(false) + " " + i18n("min") + @@ -316,7 +316,7 @@ public: KPopupMenu* popup; KPopupMenu* dvdPopup; - QToolButton* buttonMenu; + TQToolButton* buttonMenu; K3bFillStatusDisplayWidget* displayWidget; @@ -325,12 +325,12 @@ public: K3bDoc* doc; - QTimer updateTimer; + TQTimer updateTimer; }; -K3bFillStatusDisplay::K3bFillStatusDisplay( K3bDoc* doc, QWidget *parent, const char *name ) - : QFrame(parent,name) +K3bFillStatusDisplay::K3bFillStatusDisplay( K3bDoc* doc, TQWidget *tqparent, const char *name ) + : TQFrame(tqparent,name) { d = new Private; d->doc = doc; @@ -340,27 +340,27 @@ K3bFillStatusDisplay::K3bFillStatusDisplay( K3bDoc* doc, QWidget *parent, const setFrameStyle( Panel | Sunken ); d->displayWidget = new K3bFillStatusDisplayWidget( doc, this ); -// d->buttonMenu = new QToolButton( this ); +// d->buttonMenu = new TQToolButton( this ); // d->buttonMenu->setIconSet( SmallIconSet("cdrom_unmount") ); // d->buttonMenu->setAutoRaise(true); -// QToolTip::add( d->buttonMenu, i18n("Fill display properties") ); -// connect( d->buttonMenu, SIGNAL(clicked()), this, SLOT(slotMenuButtonClicked()) ); +// TQToolTip::add( d->buttonMenu, i18n("Fill display properties") ); +// connect( d->buttonMenu, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotMenuButtonClicked()) ); - QGridLayout* layout = new QGridLayout( this ); - layout->setSpacing(5); - layout->setMargin(frameWidth()); - layout->addWidget( d->displayWidget, 0, 0 ); - // layout->addWidget( d->buttonMenu, 0, 1 ); - layout->setColStretch( 0, 1 ); + TQGridLayout* tqlayout = new TQGridLayout( this ); + tqlayout->setSpacing(5); + tqlayout->setMargin(frameWidth()); + tqlayout->addWidget( d->displayWidget, 0, 0 ); + // tqlayout->addWidget( d->buttonMenu, 0, 1 ); + tqlayout->setColStretch( 0, 1 ); setupPopupMenu(); showDvdSizes( false ); - connect( d->doc, SIGNAL(changed()), this, SLOT(slotDocChanged()) ); - connect( &d->updateTimer, SIGNAL(timeout()), this, SLOT(slotUpdateDisplay()) ); - connect( k3bappcore->mediaCache(), SIGNAL(mediumChanged(K3bDevice::Device*)), - this, SLOT(slotMediumChanged(K3bDevice::Device*)) ); + connect( d->doc, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotDocChanged()) ); + connect( &d->updateTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateDisplay()) ); + connect( k3bappcore->mediaCache(), TQT_SIGNAL(mediumChanged(K3bDevice::Device*)), + this, TQT_SLOT(slotMediumChanged(K3bDevice::Device*)) ); } K3bFillStatusDisplay::~K3bFillStatusDisplay() @@ -378,32 +378,32 @@ void K3bFillStatusDisplay::setupPopupMenu() d->popup = new KPopupMenu( this, "popup" ); d->dvdPopup = new KPopupMenu( this, "dvdpopup" ); - d->actionShowMinutes = new KRadioAction( i18n("Minutes"), 0, this, SLOT(showTime()), + d->actionShowMinutes = new KRadioAction( i18n("Minutes"), 0, TQT_TQOBJECT(this), TQT_SLOT(showTime()), d->actionCollection, "fillstatus_show_minutes" ); - d->actionShowMegs = new KRadioAction( i18n("Megabytes"), 0, this, SLOT(showSize()), + d->actionShowMegs = new KRadioAction( i18n("Megabytes"), 0, TQT_TQOBJECT(this), TQT_SLOT(showSize()), d->actionCollection, "fillstatus_show_megabytes" ); d->actionShowMegs->setExclusiveGroup( "show_size_in" ); d->actionShowMinutes->setExclusiveGroup( "show_size_in" ); - d->actionAuto = new KRadioAction( i18n("Auto"), 0, this, SLOT(slotAutoSize()), + d->actionAuto = new KRadioAction( i18n("Auto"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoSize()), d->actionCollection, "fillstatus_auto" ); - d->action74Min = new KRadioAction( i18n("%1 MB").arg(650), 0, this, SLOT(slot74Minutes()), + d->action74Min = new KRadioAction( i18n("%1 MB").tqarg(650), 0, TQT_TQOBJECT(this), TQT_SLOT(slot74Minutes()), d->actionCollection, "fillstatus_74minutes" ); - d->action80Min = new KRadioAction( i18n("%1 MB").arg(700), 0, this, SLOT(slot80Minutes()), + d->action80Min = new KRadioAction( i18n("%1 MB").tqarg(700), 0, TQT_TQOBJECT(this), TQT_SLOT(slot80Minutes()), d->actionCollection, "fillstatus_80minutes" ); - d->action100Min = new KRadioAction( i18n("%1 MB").arg(880), 0, this, SLOT(slot100Minutes()), + d->action100Min = new KRadioAction( i18n("%1 MB").tqarg(880), 0, TQT_TQOBJECT(this), TQT_SLOT(slot100Minutes()), d->actionCollection, "fillstatus_100minutes" ); - d->actionDvd4_7GB = new KRadioAction( KIO::convertSizeFromKB((int)(4.4*1024.0*1024.0)), 0, this, SLOT(slotDvd4_7GB()), + d->actionDvd4_7GB = new KRadioAction( KIO::convertSizeFromKB((int)(4.4*1024.0*1024.0)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvd4_7GB()), d->actionCollection, "fillstatus_dvd_4_7gb" ); d->actionDvdDoubleLayer = new KRadioAction( KIO::convertSizeFromKB((int)(8.0*1024.0*1024.0)), - 0, this, SLOT(slotDvdDoubleLayer()), + 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvdDoubleLayer()), d->actionCollection, "fillstatus_dvd_double_layer" ); - d->actionCustomSize = new K3bRadioAction( i18n("Custom..."), 0, this, SLOT(slotCustomSize()), + d->actionCustomSize = new K3bRadioAction( i18n("Custom..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCustomSize()), d->actionCollection, "fillstatus_custom_size" ); d->actionCustomSize->setAlwaysEmitActivated(true); d->actionDetermineSize = new K3bRadioAction( i18n("From Medium..."), "cdrom_unmount", 0, - this, SLOT(slotDetermineSize()), + TQT_TQOBJECT(this), TQT_SLOT(slotDetermineSize()), d->actionCollection, "fillstatus_size_from_disk" ); d->actionDetermineSize->setAlwaysEmitActivated(true); @@ -417,14 +417,14 @@ void K3bFillStatusDisplay::setupPopupMenu() d->actionDetermineSize->setExclusiveGroup( "cd_size" ); d->actionLoadUserDefaults = new KAction( i18n("User Defaults"), "", 0, - this, SLOT(slotLoadUserDefaults()), + TQT_TQOBJECT(this), TQT_SLOT(slotLoadUserDefaults()), d->actionCollection, "load_user_defaults" ); d->actionSaveUserDefaults = new KAction( i18n("Save User Defaults"), "", 0, - this, SLOT(slotSaveUserDefaults()), + TQT_TQOBJECT(this), TQT_SLOT(slotSaveUserDefaults()), d->actionCollection, "save_user_defaults" ); KAction* dvdSizeInfoAction = new KAction( i18n("Why 4.4 instead of 4.7?"), "", 0, - this, SLOT(slotWhy44()), + TQT_TQOBJECT(this), TQT_SLOT(slotWhy44()), d->actionCollection, "why_44_gb" ); d->popup->insertTitle( i18n("Show Size In") ); @@ -452,7 +452,7 @@ void K3bFillStatusDisplay::setupPopupMenu() d->actionLoadUserDefaults->plug( d->dvdPopup ); d->actionSaveUserDefaults->plug( d->dvdPopup ); - connect( d->displayWidget, SIGNAL(contextMenu(const QPoint&)), this, SLOT(slotPopupMenu(const QPoint&)) ); + connect( d->displayWidget, TQT_SIGNAL(contextMenu(const TQPoint&)), TQT_TQOBJECT(this), TQT_SLOT(slotPopupMenu(const TQPoint&)) ); } @@ -460,9 +460,9 @@ void K3bFillStatusDisplay::showSize() { d->actionShowMegs->setChecked( true ); - d->action74Min->setText( i18n("%1 MB").arg(650) ); - d->action80Min->setText( i18n("%1 MB").arg(700) ); - d->action100Min->setText( i18n("%1 MB").arg(880) ); + d->action74Min->setText( i18n("%1 MB").tqarg(650) ); + d->action80Min->setText( i18n("%1 MB").tqarg(700) ); + d->action100Min->setText( i18n("%1 MB").tqarg(880) ); d->showTime = false; d->displayWidget->setShowTime(false); @@ -526,7 +526,7 @@ void K3bFillStatusDisplay::slotDvdDoubleLayer() void K3bFillStatusDisplay::slotWhy44() { - QWhatsThis::display( i18n("<p><b>Why does K3b offer 4.4 GB and 8.0 GB instead of 4.7 and 8.5 like " + TQWhatsThis::display( i18n("<p><b>Why does K3b offer 4.4 GB and 8.0 GB instead of 4.7 and 8.5 like " "it says on the media?</b>" "<p>A single layer DVD media has a capacity of approximately " "4.4 GB which equals 4.4*1024<sup>3</sup> bytes. Media producers just " @@ -538,29 +538,29 @@ void K3bFillStatusDisplay::slotWhy44() void K3bFillStatusDisplay::slotCustomSize() { // allow the units to be translated - QString gbS = i18n("gb"); - QString mbS = i18n("mb"); - QString minS = i18n("min"); + TQString gbS = i18n("gb"); + TQString mbS = i18n("mb"); + TQString minS = i18n("min"); - QRegExp rx( "(\\d+\\" + KGlobal::locale()->decimalSymbol() + "?\\d*)(" + gbS + "|" + mbS + "|" + minS + ")?" ); + TQRegExp rx( "(\\d+\\" + KGlobal::locale()->decimalSymbol() + "?\\d*)(" + gbS + "|" + mbS + "|" + minS + ")?" ); bool ok; - QString size = KInputDialog::getText( i18n("Custom Size"), + TQString size = KInputDialog::getText( i18n("Custom Size"), i18n("<p>Please specify the size of the media. Use suffixes <b>gb</b>,<b>mb</b>, " "and <b>min</b> for <em>gigabytes</em>, <em>megabytes</em>, and <em>minutes</em>" " respectively."), - d->showDvdSizes ? QString("4%14%2").arg(KGlobal::locale()->decimalSymbol()).arg(gbS) : - (d->showTime ? QString("74")+minS : QString("650")+mbS), + d->showDvdSizes ? TQString("4%14%2").tqarg(KGlobal::locale()->decimalSymbol()).tqarg(gbS) : + (d->showTime ? TQString("74")+minS : TQString("650")+mbS), &ok, this, (const char*)0, - new QRegExpValidator( rx, this ) ); + new TQRegExpValidator( rx, TQT_TQOBJECT(this) ) ); if( ok ) { // determine size if( rx.exactMatch( size ) ) { - QString valStr = rx.cap(1); + TQString valStr = rx.cap(1); if( valStr.endsWith( KGlobal::locale()->decimalSymbol() ) ) valStr += "0"; double val = KGlobal::locale()->readNumber( valStr, &ok ); if( ok ) { - QString s = rx.cap(2); + TQString s = rx.cap(2); if( s == gbS || (s.isEmpty() && d->showDvdSizes) ) val *= 1024*512; else if( s == mbS || (s.isEmpty() && !d->showTime) ) @@ -577,13 +577,13 @@ void K3bFillStatusDisplay::slotCustomSize() void K3bFillStatusDisplay::slotMenuButtonClicked() { - QSize size = d->showDvdSizes ? d->dvdPopup->sizeHint() : d->popup->sizeHint(); - slotPopupMenu( d->buttonMenu->mapToGlobal(QPoint(d->buttonMenu->width(), 0)) + - QPoint(-1*size.width(), -1*size.height()) ); + TQSize size = d->showDvdSizes ? d->dvdPopup->tqsizeHint() : d->popup->tqsizeHint(); + slotPopupMenu( d->buttonMenu->mapToGlobal(TQPoint(d->buttonMenu->width(), 0)) + + TQPoint(-1*size.width(), -1*size.height()) ); } -void K3bFillStatusDisplay::slotPopupMenu( const QPoint& p ) +void K3bFillStatusDisplay::slotPopupMenu( const TQPoint& p ) { if( d->showDvdSizes ) d->dvdPopup->popup(p); @@ -597,8 +597,8 @@ void K3bFillStatusDisplay::slotDetermineSize() bool canceled = false; K3bDevice::Device* dev = K3bMediaSelectionDialog::selectMedium( d->showDvdSizes ? K3bDevice::MEDIA_WRITABLE_DVD : K3bDevice::MEDIA_WRITABLE_CD, K3bDevice::STATE_EMPTY|K3bDevice::STATE_INCOMPLETE, - parentWidget(), - QString::null, QString::null, &canceled ); + tqparentWidget(), + TQString(), TQString(), &canceled ); if( dev ) { K3b::Msf size = k3bappcore->mediaCache()->diskInfo( dev ).capacity(); @@ -608,10 +608,10 @@ void K3bFillStatusDisplay::slotDetermineSize() update(); } else - KMessageBox::error( parentWidget(), i18n("Medium is not empty.") ); + KMessageBox::error( tqparentWidget(), i18n("Medium is not empty.") ); } else if( !canceled ) - KMessageBox::error( parentWidget(), i18n("No usable medium found.") ); + KMessageBox::error( tqparentWidget(), i18n("No usable medium found.") ); } @@ -673,13 +673,13 @@ void K3bFillStatusDisplay::slotMediumChanged( K3bDevice::Device* ) // TODO: once we have only one data project we need to change this to handle both K3bDevice::Device* dev = 0; - QPtrList<K3bDevice::Device> devs; + TQPtrList<K3bDevice::Device> devs; if( d->showDvdSizes ) devs = k3bcore->deviceManager()->dvdWriter(); else devs = k3bcore->deviceManager()->cdWriter(); - for( QPtrListIterator<K3bDevice::Device> it( devs ); *it; ++it ) { + for( TQPtrListIterator<K3bDevice::Device> it( devs ); *it; ++it ) { const K3bMedium& medium = k3bappcore->mediaCache()->medium( *it ); if( ( medium.diskInfo().empty() || diff --git a/src/projects/k3bfillstatusdisplay.h b/src/projects/k3bfillstatusdisplay.h index f477faa..d123426 100644 --- a/src/projects/k3bfillstatusdisplay.h +++ b/src/projects/k3bfillstatusdisplay.h @@ -18,18 +18,18 @@ #ifndef K3BFILLSTATUSDISPLAY_H #define K3BFILLSTATUSDISPLAY_H -#include <qframe.h> -#include <qtooltip.h> +#include <tqframe.h> +#include <tqtooltip.h> -class QPaintEvent; -class QMouseEvent; +class TQPaintEvent; +class TQMouseEvent; class K3bDoc; class KToggleAction; class KAction; class KActionCollection; class KPopupMenu; -class QToolButton; +class TQToolButton; namespace K3bDevice { class Device; @@ -42,16 +42,17 @@ namespace K3b { /** *@author Sebastian Trueg */ -class K3bFillStatusDisplayWidget : public QWidget +class K3bFillStatusDisplayWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - K3bFillStatusDisplayWidget( K3bDoc* doc, QWidget* parent ); + K3bFillStatusDisplayWidget( K3bDoc* doc, TQWidget* tqparent ); ~K3bFillStatusDisplayWidget(); - QSize sizeHint() const; - QSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; const K3b::Msf& cdSize() const; @@ -60,11 +61,11 @@ class K3bFillStatusDisplayWidget : public QWidget void setCdSize( const K3b::Msf& ); signals: - void contextMenu( const QPoint& ); + void contextMenu( const TQPoint& ); protected: - void mousePressEvent( QMouseEvent* ); - void paintEvent(QPaintEvent*); + void mousePressEvent( TQMouseEvent* ); + void paintEvent(TQPaintEvent*); private: class Private; @@ -72,12 +73,13 @@ class K3bFillStatusDisplayWidget : public QWidget }; -class K3bFillStatusDisplay : public QFrame { +class K3bFillStatusDisplay : public TQFrame { Q_OBJECT + TQ_OBJECT public: - K3bFillStatusDisplay(K3bDoc* doc, QWidget *parent=0, const char *name=0); + K3bFillStatusDisplay(K3bDoc* doc, TQWidget *tqparent=0, const char *name=0); ~K3bFillStatusDisplay(); public slots: @@ -98,7 +100,7 @@ class K3bFillStatusDisplay : public QFrame { void slotWhy44(); void slotCustomSize(); void slotMenuButtonClicked(); - void slotPopupMenu(const QPoint&); + void slotPopupMenu(const TQPoint&); void slotDetermineSize(); void slotDocChanged(); void slotMediumChanged( K3bDevice::Device* dev ); diff --git a/src/projects/k3bmixedburndialog.cpp b/src/projects/k3bmixedburndialog.cpp index 5d5ad28..791b3d0 100644 --- a/src/projects/k3bmixedburndialog.cpp +++ b/src/projects/k3bmixedburndialog.cpp @@ -36,21 +36,21 @@ #include <k3baudiotrackplayer.h> #include <k3bintmapcombobox.h> -#include <qtabwidget.h> -#include <qcheckbox.h> -#include <qframe.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qtoolbutton.h> -#include <qlayout.h> -#include <qvariant.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qvbox.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> +#include <tqtabwidget.h> +#include <tqcheckbox.h> +#include <tqframe.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> +#include <tqtoolbutton.h> +#include <tqlayout.h> +#include <tqvariant.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqvbox.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> #include <klocale.h> #include <kconfig.h> @@ -59,14 +59,14 @@ #include <kmessagebox.h> -K3bMixedBurnDialog::K3bMixedBurnDialog( K3bMixedDoc* doc, QWidget *parent, const char *name, bool modal ) - : K3bProjectBurnDialog( doc, parent, name, modal ), m_doc(doc) +K3bMixedBurnDialog::K3bMixedBurnDialog( K3bMixedDoc* doc, TQWidget *tqparent, const char *name, bool modal ) + : K3bProjectBurnDialog( doc, tqparent, name, modal ), m_doc(doc) { prepareGui(); setTitle( i18n("Mixed Project"), i18n("1 track (%1 minutes)", "%n tracks (%1 minutes)", - m_doc->numOfTracks()).arg(m_doc->length().toString()) ); + m_doc->numOfTracks()).tqarg(m_doc->length().toString()) ); m_checkOnlyCreateImage->hide(); @@ -80,27 +80,27 @@ K3bMixedBurnDialog::K3bMixedBurnDialog( K3bMixedDoc* doc, QWidget *parent, const setupSettingsPage(); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); m_optionGroupLayout->addItem( spacer ); - connect( m_checkNormalize, SIGNAL(toggled(bool)), this, SLOT(slotNormalizeToggled(bool)) ); - connect( m_checkCacheImage, SIGNAL(toggled(bool)), this, SLOT(slotCacheImageToggled(bool)) ); - connect( m_writerSelectionWidget, SIGNAL(writingAppChanged(int)), this, SLOT(slotToggleAll()) ); - connect( m_writingModeWidget, SIGNAL(writingModeChanged(int)), this, SLOT(slotToggleAll()) ); + connect( m_checkNormalize, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotNormalizeToggled(bool)) ); + connect( m_checkCacheImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotCacheImageToggled(bool)) ); + connect( m_writerSelectionWidget, TQT_SIGNAL(writingAppChanged(int)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_writingModeWidget, TQT_SIGNAL(writingModeChanged(int)), this, TQT_SLOT(slotToggleAll()) ); } void K3bMixedBurnDialog::setupSettingsPage() { - QWidget* w = new QWidget( this ); + TQWidget* w = new TQWidget( this ); - QGroupBox* groupDataMode = new QGroupBox( 1, Qt::Vertical, i18n("Datatrack Mode"), w ); + TQGroupBox* groupDataMode = new TQGroupBox( 1, Qt::Vertical, i18n("Datatrack Mode"), w ); m_dataModeWidget = new K3bDataModeWidget( groupDataMode ); - QGroupBox* groupNormalize = new QGroupBox( 1, Qt::Vertical, i18n("Misc"), w ); + TQGroupBox* groupNormalize = new TQGroupBox( 1, Qt::Vertical, i18n("Misc"), w ); m_checkNormalize = K3bStdGuiItems::normalizeCheckBox( groupNormalize ); - QGroupBox* groupMixedType = new QGroupBox( 1, Qt::Vertical, i18n("Mixed Mode Type"), w ); + TQGroupBox* groupMixedType = new TQGroupBox( 1, Qt::Vertical, i18n("Mixed Mode Type"), w ); m_comboMixedModeType = new K3bIntMapComboBox( groupMixedType ); m_comboMixedModeType->insertItem( K3bMixedDoc::DATA_SECOND_SESSION, @@ -128,13 +128,13 @@ void K3bMixedBurnDialog::setupSettingsPage() i18n("Data in last track"), i18n("K3b will write the data track after all " "audio tracks.") ); - m_comboMixedModeType->addGlobalWhatsThisText( QString(), + m_comboMixedModeType->addGlobalWhatsThisText( TQString(), i18n("<b>Caution:</b> The last two modes should only be used for CDs that are unlikely to " "be played on a hifi audio CD player." "<br>It could lead to problems with some older " "hifi audio CD players that try to play the data track.") ); - QGridLayout* grid = new QGridLayout( w ); + TQGridLayout* grid = new TQGridLayout( w ); grid->setMargin( marginHint() ); grid->setSpacing( spacingHint() ); grid->addWidget( groupMixedType, 0, 0 ); @@ -318,7 +318,7 @@ void K3bMixedBurnDialog::slotNormalizeToggled( bool on ) if( KMessageBox::warningYesNo( this, i18n("<p>K3b is not able to normalize audio tracks when burning on-the-fly. " "The external program used for this task only supports normalizing a set " "of audio files."), - QString::null, + TQString(), i18n("Disable normalization"), i18n("Disable on-the-fly burning"), "audioProjectNormalizeOrOnTheFly" ) == KMessageBox::Yes ) @@ -337,7 +337,7 @@ void K3bMixedBurnDialog::slotCacheImageToggled( bool on ) if( KMessageBox::warningYesNo( this, i18n("<p>K3b is not able to normalize audio tracks when burning on-the-fly. " "The external program used for this task only supports normalizing a set " "of audio files."), - QString::null, + TQString(), i18n("Disable normalization"), i18n("Disable on-the-fly burning"), "audioProjectNormalizeOrOnTheFly" ) == KMessageBox::Yes ) diff --git a/src/projects/k3bmixedburndialog.h b/src/projects/k3bmixedburndialog.h index 363d26e..94d224e 100644 --- a/src/projects/k3bmixedburndialog.h +++ b/src/projects/k3bmixedburndialog.h @@ -19,13 +19,13 @@ #include "k3bprojectburndialog.h" -class QCheckBox; +class TQCheckBox; class K3bWriterSelectionWidget; class K3bTempDirSelectionWidget; class K3bMixedDoc; class K3bDataImageSettingsWidget; -class QButtonGroup; -class QRadioButton; +class TQButtonGroup; +class TQRadioButton; class K3bAudioCdTextWidget; class K3bDataModeWidget; class K3bIntMapComboBox; @@ -37,9 +37,10 @@ class K3bIntMapComboBox; class K3bMixedBurnDialog : public K3bProjectBurnDialog { Q_OBJECT + TQ_OBJECT public: - K3bMixedBurnDialog( K3bMixedDoc*, QWidget *parent=0, const char *name=0, bool modal = true ); + K3bMixedBurnDialog( K3bMixedDoc*, TQWidget *tqparent=0, const char *name=0, bool modal = true ); protected: void loadK3bDefaults(); @@ -66,11 +67,11 @@ class K3bMixedBurnDialog : public K3bProjectBurnDialog K3bMixedDoc* m_doc; K3bIntMapComboBox* m_comboMixedModeType; - QRadioButton* m_radioMixedTypeFirstTrack; - QRadioButton* m_radioMixedTypeLastTrack; - QRadioButton* m_radioMixedTypeSessions; + TQRadioButton* m_radioMixedTypeFirstTrack; + TQRadioButton* m_radioMixedTypeLastTrack; + TQRadioButton* m_radioMixedTypeSessions; - QCheckBox* m_checkNormalize; + TQCheckBox* m_checkNormalize; K3bDataModeWidget* m_dataModeWidget; }; diff --git a/src/projects/k3bmixeddirtreeview.cpp b/src/projects/k3bmixeddirtreeview.cpp index 50d818a..9a014dc 100644 --- a/src/projects/k3bmixeddirtreeview.cpp +++ b/src/projects/k3bmixeddirtreeview.cpp @@ -22,7 +22,7 @@ #include <k3baudiodoc.h> #include <k3bdataviewitem.h> -#include <qevent.h> +#include <tqevent.h> #include <kdebug.h> #include <kiconloader.h> @@ -33,18 +33,18 @@ class K3bMixedDirTreeView::PrivateAudioRootViewItem : public K3bListViewItem { public: - PrivateAudioRootViewItem( K3bMixedDoc* doc, QListView* parent, QListViewItem* after ) - : K3bListViewItem( parent, after ), + PrivateAudioRootViewItem( K3bMixedDoc* doc, TQListView* tqparent, TQListViewItem* after ) + : K3bListViewItem( tqparent, after ), m_doc(doc) { setPixmap( 0, SmallIcon("sound") ); } - QString text( int col ) const { + TQString text( int col ) const { if( col == 0 ) - return i18n("Audio Tracks") + QString(" (%1)").arg(m_doc->audioDoc()->numOfTracks()); + return i18n("Audio Tracks") + TQString(" (%1)").tqarg(m_doc->audioDoc()->numOfTracks()); else - return QString::null; + return TQString(); } private: @@ -52,14 +52,14 @@ public: }; -K3bMixedDirTreeView::K3bMixedDirTreeView( K3bView* view, K3bMixedDoc* doc, QWidget* parent, const char* ) - : K3bDataDirTreeView( view, doc->dataDoc(), parent ), m_doc(doc) +K3bMixedDirTreeView::K3bMixedDirTreeView( K3bView* view, K3bMixedDoc* doc, TQWidget* tqparent, const char* ) + : K3bDataDirTreeView( view, doc->dataDoc(), tqparent ), m_doc(doc) { m_audioRootItem = new PrivateAudioRootViewItem( doc, this, root() ); - connect( this, SIGNAL(selectionChanged(QListViewItem*)), - this, SLOT(slotSelectionChanged(QListViewItem*)) ); - connect( m_doc->audioDoc(), SIGNAL(changed()), this, SLOT(slotNewAudioTracks()) ); + connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( m_doc->audioDoc(), TQT_SIGNAL(changed()), this, TQT_SLOT(slotNewAudioTracks()) ); } @@ -68,12 +68,12 @@ K3bMixedDirTreeView::~K3bMixedDirTreeView() } -void K3bMixedDirTreeView::slotDropped( QDropEvent* e, QListViewItem* parent, QListViewItem* after ) +void K3bMixedDirTreeView::slotDropped( TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after ) { if( !e->isAccepted() ) return; - QListViewItem* droppedItem = itemAt(e->pos()); + TQListViewItem* droppedItem = itemAt(e->pos()); if( droppedItem == m_audioRootItem ) { KURL::List urls; if( KURLDrag::decode( e, urls ) ) { @@ -81,11 +81,11 @@ void K3bMixedDirTreeView::slotDropped( QDropEvent* e, QListViewItem* parent, QLi } } else - K3bDataDirTreeView::slotDropped( e, parent, after ); + K3bDataDirTreeView::slotDropped( e, tqparent, after ); } -void K3bMixedDirTreeView::slotSelectionChanged( QListViewItem* i ) +void K3bMixedDirTreeView::slotSelectionChanged( TQListViewItem* i ) { if( i == m_audioRootItem ) emit audioTreeSelected(); @@ -97,7 +97,7 @@ void K3bMixedDirTreeView::slotSelectionChanged( QListViewItem* i ) void K3bMixedDirTreeView::slotNewAudioTracks() { // update the tracknumber - m_audioRootItem->repaint(); + m_audioRootItem->tqrepaint(); } #include "k3bmixeddirtreeview.moc" diff --git a/src/projects/k3bmixeddirtreeview.h b/src/projects/k3bmixeddirtreeview.h index 8a8bfe9..a7320fc 100644 --- a/src/projects/k3bmixeddirtreeview.h +++ b/src/projects/k3bmixeddirtreeview.h @@ -22,16 +22,17 @@ class K3bView; class K3bMixedDoc; -class QDropEvent; -class QListViewItem; +class TQDropEvent; +class TQListViewItem; class K3bMixedDirTreeView : public K3bDataDirTreeView { Q_OBJECT + TQ_OBJECT public: - K3bMixedDirTreeView( K3bView* view, K3bMixedDoc* doc, QWidget* parent = 0, const char* name = 0 ); + K3bMixedDirTreeView( K3bView* view, K3bMixedDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); ~K3bMixedDirTreeView(); signals: @@ -39,10 +40,10 @@ class K3bMixedDirTreeView : public K3bDataDirTreeView void dataTreeSelected(); protected slots: - void slotDropped( QDropEvent* e, QListViewItem* after, QListViewItem* parent ); + void slotDropped( TQDropEvent* e, TQListViewItem* after, TQListViewItem* tqparent ); private slots: - void slotSelectionChanged( QListViewItem* i ); + void slotSelectionChanged( TQListViewItem* i ); void slotNewAudioTracks(); private: diff --git a/src/projects/k3bmixedview.cpp b/src/projects/k3bmixedview.cpp index 68900c7..1022d0a 100644 --- a/src/projects/k3bmixedview.cpp +++ b/src/projects/k3bmixedview.cpp @@ -31,10 +31,10 @@ #include <k3btoolbox.h> #include <k3bprojectplugin.h> -#include <qwidgetstack.h> -#include <qsplitter.h> -#include <qlayout.h> -#include <qvaluelist.h> +#include <tqwidgetstack.h> +#include <tqsplitter.h> +#include <tqlayout.h> +#include <tqvaluelist.h> #include <kdialog.h> #include <klocale.h> @@ -44,22 +44,22 @@ #include <kactionclasses.h> -K3bMixedView::K3bMixedView( K3bMixedDoc* doc, QWidget* parent, const char* name ) - : K3bView( doc, parent, name ), m_doc(doc) +K3bMixedView::K3bMixedView( K3bMixedDoc* doc, TQWidget* tqparent, const char* name ) + : K3bView( doc, tqparent, name ), m_doc(doc) { - QSplitter* splitter = new QSplitter( this ); + TQSplitter* splitter = new TQSplitter( this ); m_mixedDirTreeView = new K3bMixedDirTreeView( this, doc, splitter ); - m_widgetStack = new QWidgetStack( splitter ); + m_widgetStack = new TQWidgetStack( splitter ); m_dataFileView = new K3bDataFileView( this, m_mixedDirTreeView, doc->dataDoc(), m_widgetStack ); m_mixedDirTreeView->setFileView( m_dataFileView ); m_audioListView = new K3bAudioTrackView( doc->audioDoc(), m_widgetStack ); setMainWidget( splitter ); - connect( m_mixedDirTreeView, SIGNAL(audioTreeSelected()), - this, SLOT(slotAudioTreeSelected()) ); - connect( m_mixedDirTreeView, SIGNAL(dataTreeSelected()), - this, SLOT(slotDataTreeSelected()) ); + connect( m_mixedDirTreeView, TQT_SIGNAL(audioTreeSelected()), + this, TQT_SLOT(slotAudioTreeSelected()) ); + connect( m_mixedDirTreeView, TQT_SIGNAL(dataTreeSelected()), + this, TQT_SLOT(slotDataTreeSelected()) ); m_widgetStack->raiseWidget( m_dataFileView ); @@ -123,7 +123,7 @@ void K3bMixedView::slotBurn() { if( m_doc->audioDoc()->numOfTracks() == 0 || m_doc->dataDoc()->size() == 0 ) { KMessageBox::information( this, i18n("Please add files and audio titles to your project first."), - i18n("No Data to Burn"), QString::null, false ); + i18n("No Data to Burn"), TQString(), false ); } else { K3bProjectBurnDialog* dlg = newBurnDialog( this ); @@ -138,9 +138,9 @@ void K3bMixedView::slotBurn() } -K3bProjectBurnDialog* K3bMixedView::newBurnDialog( QWidget* parent, const char* name ) +K3bProjectBurnDialog* K3bMixedView::newBurnDialog( TQWidget* tqparent, const char* name ) { - return new K3bMixedBurnDialog( m_doc, parent, name, true ); + return new K3bMixedBurnDialog( m_doc, tqparent, name, true ); } diff --git a/src/projects/k3bmixedview.h b/src/projects/k3bmixedview.h index 8e52df7..1111dd3 100644 --- a/src/projects/k3bmixedview.h +++ b/src/projects/k3bmixedview.h @@ -21,11 +21,11 @@ #include <kurl.h> class K3bMixedDoc; -class QWidgetStack; +class TQWidgetStack; class K3bDataFileView; class K3bMixedDirTreeView; class K3bAudioTrackView; -class QListViewItem; +class TQListViewItem; class K3bDirItem; class K3bAudioTrackPlayer; @@ -33,9 +33,10 @@ class K3bAudioTrackPlayer; class K3bMixedView : public K3bView { Q_OBJECT + TQ_OBJECT public: - K3bMixedView( K3bMixedDoc* doc, QWidget* parent = 0, const char* name = 0 ); + K3bMixedView( K3bMixedDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); ~K3bMixedView(); K3bDirItem* currentDir() const; @@ -47,7 +48,7 @@ class K3bMixedView : public K3bView void addUrls( const KURL::List& ); protected: - K3bProjectBurnDialog* newBurnDialog( QWidget* parent = 0, const char* name = 0 ); + K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); private slots: void slotAudioTreeSelected(); @@ -56,7 +57,7 @@ class K3bMixedView : public K3bView private: K3bMixedDoc* m_doc; - QWidgetStack* m_widgetStack; + TQWidgetStack* m_widgetStack; K3bMixedDirTreeView* m_mixedDirTreeView; K3bDataFileView* m_dataFileView; diff --git a/src/projects/k3bmovixburndialog.cpp b/src/projects/k3bmovixburndialog.cpp index 94238a7..1a785d8 100644 --- a/src/projects/k3bmovixburndialog.cpp +++ b/src/projects/k3bmovixburndialog.cpp @@ -37,14 +37,14 @@ #include <kapplication.h> #include <kconfig.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qgroupbox.h> -#include <qfileinfo.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqgroupbox.h> +#include <tqfileinfo.h> -K3bMovixBurnDialog::K3bMovixBurnDialog( K3bMovixDoc* doc, QWidget* parent, const char* name, bool modal ) - : K3bProjectBurnDialog( doc, parent, name, modal ), +K3bMovixBurnDialog::K3bMovixBurnDialog( K3bMovixDoc* doc, TQWidget* tqparent, const char* name, bool modal ) + : K3bProjectBurnDialog( doc, tqparent, name, modal ), m_doc(doc) { prepareGui(); @@ -52,7 +52,7 @@ K3bMovixBurnDialog::K3bMovixBurnDialog( K3bMovixDoc* doc, QWidget* parent, const m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE ); setTitle( i18n("eMovix CD Project"), - i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size())) ); + i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).tqarg(KIO::convertSize(m_doc->size())) ); m_movixOptionsWidget = new K3bMovixOptionsWidget( this ); addPage( m_movixOptionsWidget, i18n("eMovix") ); @@ -67,11 +67,11 @@ K3bMovixBurnDialog::K3bMovixBurnDialog( K3bMovixDoc* doc, QWidget* parent, const m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup ); m_optionGroupLayout->addWidget( m_checkVerify ); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); m_optionGroupLayout->addItem( spacer ); m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE ); - QString path = m_doc->tempDir(); + TQString path = m_doc->tempDir(); if( !path.isEmpty() ) { m_tempDirSelectionWidget->setTempPath( path ); } @@ -79,8 +79,8 @@ K3bMovixBurnDialog::K3bMovixBurnDialog( K3bMovixDoc* doc, QWidget* parent, const m_tempDirSelectionWidget->setDefaultImageFileName( m_doc->isoOptions().volumeID() + ".iso" ); } - connect( m_imageSettingsWidget->m_editVolumeName, SIGNAL(textChanged(const QString&)), - m_tempDirSelectionWidget, SLOT(setDefaultImageFileName(const QString&)) ); + connect( m_imageSettingsWidget->m_editVolumeName, TQT_SIGNAL(textChanged(const TQString&)), + m_tempDirSelectionWidget, TQT_SLOT(setDefaultImageFileName(const TQString&)) ); } @@ -91,15 +91,15 @@ K3bMovixBurnDialog::~K3bMovixBurnDialog() void K3bMovixBurnDialog::setupSettingsPage() { - QWidget* frame = new QWidget( this ); - QGridLayout* frameLayout = new QGridLayout( frame ); + TQWidget* frame = new TQWidget( this ); + TQGridLayout* frameLayout = new TQGridLayout( frame ); frameLayout->setSpacing( spacingHint() ); frameLayout->setMargin( marginHint() ); - QGroupBox* groupDataMode = new QGroupBox( 1, Qt::Vertical, i18n("Datatrack Mode"), frame ); + TQGroupBox* groupDataMode = new TQGroupBox( 1, Qt::Vertical, i18n("Datatrack Mode"), frame ); m_dataModeWidget = new K3bDataModeWidget( groupDataMode ); - QGroupBox* groupMultisession = new QGroupBox( 1, Qt::Vertical, i18n("Multisession"), frame ); + TQGroupBox* groupMultisession = new TQGroupBox( 1, Qt::Vertical, i18n("Multisession"), frame ); m_checkStartMultiSesssion = K3bStdGuiItems::startMultisessionCheckBox( groupMultisession ); frameLayout->addWidget( groupDataMode, 0, 0 ); @@ -220,13 +220,13 @@ void K3bMovixBurnDialog::slotStartClicked() { if( m_checkOnlyCreateImage->isChecked() || m_checkCacheImage->isChecked() ) { - QFileInfo fi( m_tempDirSelectionWidget->tempPath() ); + TQFileInfo fi( m_tempDirSelectionWidget->tempPath() ); if( fi.isDir() ) m_tempDirSelectionWidget->setTempPath( fi.filePath() + "/image.iso" ); - if( QFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { + if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { if( KMessageBox::warningContinueCancel( this, - i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()), + i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()), i18n("File Exists"), i18n("Overwrite") ) != KMessageBox::Continue ) return; diff --git a/src/projects/k3bmovixburndialog.h b/src/projects/k3bmovixburndialog.h index ff237c0..326a5b7 100644 --- a/src/projects/k3bmovixburndialog.h +++ b/src/projects/k3bmovixburndialog.h @@ -23,16 +23,17 @@ class K3bMovixDoc; class K3bMovixOptionsWidget; class K3bDataImageSettingsWidget; -class QCheckBox; +class TQCheckBox; class K3bDataModeWidget; class K3bMovixBurnDialog : public K3bProjectBurnDialog { Q_OBJECT + TQ_OBJECT public: - K3bMovixBurnDialog( K3bMovixDoc* doc, QWidget* parent = 0, const char* name = 0, bool modal = true ); + K3bMovixBurnDialog( K3bMovixDoc* doc, TQWidget* tqparent = 0, const char* name = 0, bool modal = true ); ~K3bMovixBurnDialog(); protected slots: @@ -53,10 +54,10 @@ class K3bMovixBurnDialog : public K3bProjectBurnDialog K3bMovixOptionsWidget* m_movixOptionsWidget; K3bDataImageSettingsWidget* m_imageSettingsWidget; - QCheckBox* m_checkStartMultiSesssion; + TQCheckBox* m_checkStartMultiSesssion; K3bDataModeWidget* m_dataModeWidget; - QCheckBox* m_checkVerify; + TQCheckBox* m_checkVerify; }; diff --git a/src/projects/k3bmovixdvdburndialog.cpp b/src/projects/k3bmovixdvdburndialog.cpp index 3707e3a..fccc3b0 100644 --- a/src/projects/k3bmovixdvdburndialog.cpp +++ b/src/projects/k3bmovixdvdburndialog.cpp @@ -39,14 +39,14 @@ #include <kconfig.h> #include <kdebug.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qgroupbox.h> -#include <qfileinfo.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqgroupbox.h> +#include <tqfileinfo.h> -K3bMovixDvdBurnDialog::K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, QWidget* parent, const char* name, bool modal ) - : K3bProjectBurnDialog( doc, parent, name, modal, true ), +K3bMovixDvdBurnDialog::K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, TQWidget* tqparent, const char* name, bool modal ) + : K3bProjectBurnDialog( doc, tqparent, name, modal, true ), m_doc(doc) { prepareGui(); @@ -54,7 +54,7 @@ K3bMovixDvdBurnDialog::K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, QWidget* pare m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE ); setTitle( i18n("eMovix DVD Project"), - i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size())) ); + i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).tqarg(KIO::convertSize(m_doc->size())) ); m_movixOptionsWidget = new K3bMovixOptionsWidget( this ); addPage( m_movixOptionsWidget, i18n("eMovix") ); @@ -67,11 +67,11 @@ K3bMovixDvdBurnDialog::K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, QWidget* pare m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup ); m_optionGroupLayout->addWidget( m_checkVerify ); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); m_optionGroupLayout->addItem( spacer ); m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE ); - QString path = m_doc->tempDir(); + TQString path = m_doc->tempDir(); if( !path.isEmpty() ) { m_tempDirSelectionWidget->setTempPath( path ); } @@ -79,8 +79,8 @@ K3bMovixDvdBurnDialog::K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, QWidget* pare m_tempDirSelectionWidget->setDefaultImageFileName( m_doc->isoOptions().volumeID() + ".iso" ); } - connect( m_imageSettingsWidget->m_editVolumeName, SIGNAL(textChanged(const QString&)), - m_tempDirSelectionWidget, SLOT(setDefaultImageFileName(const QString&)) ); + connect( m_imageSettingsWidget->m_editVolumeName, TQT_SIGNAL(textChanged(const TQString&)), + m_tempDirSelectionWidget, TQT_SLOT(setDefaultImageFileName(const TQString&)) ); } @@ -187,13 +187,13 @@ void K3bMovixDvdBurnDialog::slotStartClicked() { if( m_checkOnlyCreateImage->isChecked() || m_checkCacheImage->isChecked() ) { - QFileInfo fi( m_tempDirSelectionWidget->tempPath() ); + TQFileInfo fi( m_tempDirSelectionWidget->tempPath() ); if( fi.isDir() ) m_tempDirSelectionWidget->setTempPath( fi.filePath() + "/image.iso" ); - if( QFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { + if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { if( KMessageBox::warningContinueCancel( this, - i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()), + i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()), i18n("File Exists"), i18n("Overwrite") ) != KMessageBox::Continue ) return; diff --git a/src/projects/k3bmovixdvdburndialog.h b/src/projects/k3bmovixdvdburndialog.h index df7b456..ca0b4d0 100644 --- a/src/projects/k3bmovixdvdburndialog.h +++ b/src/projects/k3bmovixdvdburndialog.h @@ -23,15 +23,16 @@ class K3bMovixDvdDoc; class K3bMovixOptionsWidget; class K3bDataImageSettingsWidget; -class QCheckBox; +class TQCheckBox; class K3bMovixDvdBurnDialog : public K3bProjectBurnDialog { Q_OBJECT + TQ_OBJECT public: - K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, QWidget* parent = 0, const char* name = 0, bool modal = true ); + K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, TQWidget* tqparent = 0, const char* name = 0, bool modal = true ); ~K3bMovixDvdBurnDialog(); protected slots: @@ -50,7 +51,7 @@ class K3bMovixDvdBurnDialog : public K3bProjectBurnDialog K3bMovixOptionsWidget* m_movixOptionsWidget; K3bDataImageSettingsWidget* m_imageSettingsWidget; - QCheckBox* m_checkVerify; + TQCheckBox* m_checkVerify; }; #endif diff --git a/src/projects/k3bmovixdvdview.cpp b/src/projects/k3bmovixdvdview.cpp index 8173199..42b864d 100644 --- a/src/projects/k3bmovixdvdview.cpp +++ b/src/projects/k3bmovixdvdview.cpp @@ -22,8 +22,8 @@ #include <klocale.h> -K3bMovixDvdView::K3bMovixDvdView( K3bMovixDvdDoc* doc, QWidget *parent, const char *name ) - : K3bMovixView( doc, parent, name ) +K3bMovixDvdView::K3bMovixDvdView( K3bMovixDvdDoc* doc, TQWidget *tqparent, const char *name ) + : K3bMovixView( doc, tqparent, name ) { m_doc = doc; @@ -40,9 +40,9 @@ K3bMovixDvdView::~K3bMovixDvdView() } -K3bProjectBurnDialog* K3bMovixDvdView::newBurnDialog( QWidget* parent, const char* name ) +K3bProjectBurnDialog* K3bMovixDvdView::newBurnDialog( TQWidget* tqparent, const char* name ) { - return new K3bMovixDvdBurnDialog( m_doc, parent, name, true ); + return new K3bMovixDvdBurnDialog( m_doc, tqparent, name, true ); } #include "k3bmovixdvdview.moc" diff --git a/src/projects/k3bmovixdvdview.h b/src/projects/k3bmovixdvdview.h index 643b259..d6d1977 100644 --- a/src/projects/k3bmovixdvdview.h +++ b/src/projects/k3bmovixdvdview.h @@ -25,13 +25,14 @@ class K3bMovixDvdDoc; class K3bMovixDvdView : public K3bMovixView { Q_OBJECT + TQ_OBJECT public: - K3bMovixDvdView( K3bMovixDvdDoc* doc, QWidget *parent = 0, const char *name = 0 ); + K3bMovixDvdView( K3bMovixDvdDoc* doc, TQWidget *tqparent = 0, const char *name = 0 ); ~K3bMovixDvdView(); protected: - K3bProjectBurnDialog* newBurnDialog( QWidget* parent = 0, const char* name = 0 ); + K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); private: K3bMovixDvdDoc* m_doc; diff --git a/src/projects/k3bmovixlistview.cpp b/src/projects/k3bmovixlistview.cpp index 9b943d3..93b217c 100644 --- a/src/projects/k3bmovixlistview.cpp +++ b/src/projects/k3bmovixlistview.cpp @@ -24,17 +24,17 @@ #include <kio/global.h> #include <kurldrag.h> -#include <qdragobject.h> -#include <qptrlist.h> -#include <qevent.h> -#include <qheader.h> +#include <tqdragobject.h> +#include <tqptrlist.h> +#include <tqevent.h> +#include <tqheader.h> K3bMovixListViewItem::K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixFileItem* item, - QListView* parent, - QListViewItem* after ) - : K3bListViewItem( parent, after ), + TQListView* tqparent, + TQListViewItem* after ) + : K3bListViewItem( tqparent, after ), m_doc(doc), m_fileItem(item) { @@ -43,8 +43,8 @@ K3bMovixListViewItem::K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixListViewItem::K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixFileItem* item, - QListViewItem* parent ) - : K3bListViewItem( parent ), + TQListViewItem* tqparent ) + : K3bListViewItem( tqparent ), m_doc(doc), m_fileItem(item) { @@ -58,9 +58,9 @@ K3bMovixListViewItem::~K3bMovixListViewItem() K3bMovixFileViewItem::K3bMovixFileViewItem( K3bMovixDoc* doc, K3bMovixFileItem* item, - QListView* parent, - QListViewItem* after ) - : K3bMovixListViewItem( doc, item, parent, after ), + TQListView* tqparent, + TQListViewItem* after ) + : K3bMovixListViewItem( doc, item, tqparent, after ), KFileItem( 0, 0, KURL::fromPathOrURL(item->localPath()) ) { setPixmap( 1, KFileItem::pixmap( 16, KIcon::DefaultState ) ); @@ -68,7 +68,7 @@ K3bMovixFileViewItem::K3bMovixFileViewItem( K3bMovixDoc* doc, } -QString K3bMovixFileViewItem::text( int col ) const +TQString K3bMovixFileViewItem::text( int col ) const { // // We add two spaces after all strings (except the once renamable) @@ -78,13 +78,13 @@ QString K3bMovixFileViewItem::text( int col ) const switch( col ) { case 0: // allowing 999 files to be added. - return QString::number( doc()->indexOf( fileItem() ) ).rightJustify( 3, ' ' ); + return TQString::number( doc()->indexOf( fileItem() ) ).rightJustify( 3, ' ' ); case 1: return fileItem()->k3bName(); case 2: { if( fileItem()->isSymLink() ) - return i18n("Link to %1").arg(const_cast<K3bMovixFileViewItem*>(this)->mimeComment()) + " "; + return i18n("Link to %1").tqarg(const_cast<K3bMovixFileViewItem*>(this)->mimeComment()) + " "; else return const_cast<K3bMovixFileViewItem*>(this)->mimeComment() + " "; } @@ -100,7 +100,7 @@ QString K3bMovixFileViewItem::text( int col ) const } -void K3bMovixFileViewItem::setText( int col, const QString& text ) +void K3bMovixFileViewItem::setText( int col, const TQString& text ) { if( col == 1 ) fileItem()->setK3bName( text ); @@ -109,9 +109,9 @@ void K3bMovixFileViewItem::setText( int col, const QString& text ) } -QString K3bMovixFileViewItem::key( int, bool ) const +TQString K3bMovixFileViewItem::key( int, bool ) const { - return QString::number( doc()->indexOf( fileItem() ) ).rightJustify( 10, '0' ); + return TQString::number( doc()->indexOf( fileItem() ) ).rightJustify( 10, '0' ); } @@ -119,8 +119,8 @@ QString K3bMovixFileViewItem::key( int, bool ) const K3bMovixSubTitleViewItem::K3bMovixSubTitleViewItem( K3bMovixDoc* doc, K3bMovixFileItem* item, - K3bMovixListViewItem* parent ) - : K3bMovixListViewItem( doc, item, parent ), + K3bMovixListViewItem* tqparent ) + : K3bMovixListViewItem( doc, item, tqparent ), KFileItem( 0, 0, KURL::fromPathOrURL(item->subTitleItem()->localPath()) ) { } @@ -131,7 +131,7 @@ K3bMovixSubTitleViewItem::~K3bMovixSubTitleViewItem() } -QString K3bMovixSubTitleViewItem::text( int c ) const +TQString K3bMovixSubTitleViewItem::text( int c ) const { switch( c ) { case 1: @@ -139,7 +139,7 @@ QString K3bMovixSubTitleViewItem::text( int c ) const case 2: { if( fileItem()->subTitleItem()->isSymLink() ) - return i18n("Link to %1").arg(const_cast<K3bMovixSubTitleViewItem*>(this)->mimeComment()); + return i18n("Link to %1").tqarg(const_cast<K3bMovixSubTitleViewItem*>(this)->mimeComment()); else return const_cast<K3bMovixSubTitleViewItem*>(this)->mimeComment(); } @@ -166,8 +166,8 @@ QString K3bMovixSubTitleViewItem::text( int c ) const -K3bMovixListView::K3bMovixListView( K3bMovixDoc* doc, QWidget* parent, const char* name ) - : K3bListView( parent, name ), +K3bMovixListView::K3bMovixListView( K3bMovixDoc* doc, TQWidget* tqparent, const char* name ) + : K3bListView( tqparent, name ), m_doc(doc) { addColumn( i18n("No.") ); @@ -189,12 +189,12 @@ K3bMovixListView::K3bMovixListView( K3bMovixDoc* doc, QWidget* parent, const cha + i18n("To remove or rename files use the context menu.") + "\n" + i18n("After that press the burn button to write the CD.") ); - connect( m_doc, SIGNAL(changed()), this, SLOT(slotChanged()) ); - connect( m_doc, SIGNAL(newMovixFileItems()), this, SLOT(slotNewFileItems()) ); - connect( m_doc, SIGNAL(movixItemRemoved(K3bMovixFileItem*)), this, SLOT(slotFileItemRemoved(K3bMovixFileItem*)) ); - connect( m_doc, SIGNAL(subTitleItemRemoved(K3bMovixFileItem*)), this, SLOT(slotSubTitleItemRemoved(K3bMovixFileItem*)) ); - connect( this, SIGNAL(dropped(KListView*, QDropEvent*, QListViewItem*)), - this, SLOT(slotDropped(KListView*, QDropEvent*, QListViewItem*)) ); + connect( m_doc, TQT_SIGNAL(changed()), this, TQT_SLOT(slotChanged()) ); + connect( m_doc, TQT_SIGNAL(newMovixFileItems()), this, TQT_SLOT(slotNewFileItems()) ); + connect( m_doc, TQT_SIGNAL(movixItemRemoved(K3bMovixFileItem*)), this, TQT_SLOT(slotFileItemRemoved(K3bMovixFileItem*)) ); + connect( m_doc, TQT_SIGNAL(subTitleItemRemoved(K3bMovixFileItem*)), this, TQT_SLOT(slotSubTitleItemRemoved(K3bMovixFileItem*)) ); + connect( this, TQT_SIGNAL(dropped(KListView*, TQDropEvent*, TQListViewItem*)), + this, TQT_SLOT(slotDropped(KListView*, TQDropEvent*, TQListViewItem*)) ); // let's see what the doc already has slotNewFileItems(); @@ -207,7 +207,7 @@ K3bMovixListView::~K3bMovixListView() } -bool K3bMovixListView::acceptDrag(QDropEvent* e) const +bool K3bMovixListView::acceptDrag(TQDropEvent* e) const { // the first is for built-in item moving, the second for dropping urls return ( K3bListView::acceptDrag(e) || KURLDrag::canDecode(e) ); @@ -217,9 +217,9 @@ bool K3bMovixListView::acceptDrag(QDropEvent* e) const void K3bMovixListView::slotNewFileItems() { K3bMovixFileItem* lastItem = 0; - for( QPtrListIterator<K3bMovixFileItem> it( m_doc->movixFileItems() ); it.current(); ++it ) { + for( TQPtrListIterator<K3bMovixFileItem> it( m_doc->movixFileItems() ); it.current(); ++it ) { K3bMovixFileItem* item = it.current(); - if( !m_itemMap.contains( item ) ) + if( !m_itemMap.tqcontains( item ) ) m_itemMap.insert( item, new K3bMovixFileViewItem( m_doc, item, this, lastItem ? m_itemMap[lastItem] : 0L ) ); if( item->subTitleItem() ) { @@ -240,7 +240,7 @@ void K3bMovixListView::slotNewFileItems() void K3bMovixListView::slotFileItemRemoved( K3bMovixFileItem* item ) { - if( m_itemMap.contains( item ) ) { + if( m_itemMap.tqcontains( item ) ) { K3bMovixFileViewItem* vi = m_itemMap[item]; m_itemMap.erase(item); delete vi; @@ -250,7 +250,7 @@ void K3bMovixListView::slotFileItemRemoved( K3bMovixFileItem* item ) void K3bMovixListView::slotSubTitleItemRemoved( K3bMovixFileItem* item ) { - if( m_itemMap.contains( item ) ) { + if( m_itemMap.tqcontains( item ) ) { K3bMovixFileViewItem* vi = m_itemMap[item]; if( vi->childCount() >= 1 ) delete vi->firstChild(); @@ -258,7 +258,7 @@ void K3bMovixListView::slotSubTitleItemRemoved( K3bMovixFileItem* item ) } -void K3bMovixListView::slotDropped( KListView*, QDropEvent* e, QListViewItem* after ) +void K3bMovixListView::slotDropped( KListView*, TQDropEvent* e, TQListViewItem* after ) { if( !e->isAccepted() ) return; @@ -270,8 +270,8 @@ void K3bMovixListView::slotDropped( KListView*, QDropEvent* e, QListViewItem* af pos = m_doc->indexOf( ((K3bMovixListViewItem*)after)->fileItem() ); if( e->source() == viewport() ) { - QPtrList<QListViewItem> sel = selectedItems(); - QPtrListIterator<QListViewItem> it(sel); + TQPtrList<TQListViewItem> sel = selectedItems(); + TQPtrListIterator<TQListViewItem> it(sel); K3bMovixFileItem* itemAfter = ( after ? ((K3bMovixListViewItem*)after)->fileItem() : 0 ); while( it.current() ) { K3bMovixListViewItem* vi = (K3bMovixListViewItem*)it.current(); @@ -302,14 +302,14 @@ void K3bMovixListView::slotDropped( KListView*, QDropEvent* e, QListViewItem* af } -QDragObject* K3bMovixListView::dragObject() +TQDragObject* K3bMovixListView::dragObject() { - QPtrList<QListViewItem> list = selectedItems(); + TQPtrList<TQListViewItem> list = selectedItems(); if( list.isEmpty() ) return 0; - QPtrListIterator<QListViewItem> it(list); + TQPtrListIterator<TQListViewItem> it(list); KURL::List urls; for( ; it.current(); ++it ) diff --git a/src/projects/k3bmovixlistview.h b/src/projects/k3bmovixlistview.h index 7426ddb..d3b8119 100644 --- a/src/projects/k3bmovixlistview.h +++ b/src/projects/k3bmovixlistview.h @@ -21,7 +21,7 @@ #include <k3blistview.h> #include <kfileitem.h> -#include <qmap.h> +#include <tqmap.h> class K3bMovixDoc; @@ -32,8 +32,8 @@ class K3bFileItem; class K3bMovixListViewItem : public K3bListViewItem { public: - K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixFileItem*, QListView* parent, QListViewItem* after ); - K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixFileItem*, QListViewItem* parent ); + K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixFileItem*, TQListView* tqparent, TQListViewItem* after ); + K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixFileItem*, TQListViewItem* tqparent ); ~K3bMovixListViewItem(); K3bMovixFileItem* fileItem() const { return m_fileItem; } @@ -50,22 +50,22 @@ class K3bMovixListViewItem : public K3bListViewItem class K3bMovixFileViewItem : public K3bMovixListViewItem, public KFileItem { public: - K3bMovixFileViewItem( K3bMovixDoc* doc, K3bMovixFileItem*, QListView* parent, QListViewItem* ); + K3bMovixFileViewItem( K3bMovixDoc* doc, K3bMovixFileItem*, TQListView* tqparent, TQListViewItem* ); - QString text( int ) const; - void setText(int col, const QString& text ); + TQString text( int ) const; + void setText(int col, const TQString& text ); /** always sort according to the playlist order */ - QString key( int, bool ) const; + TQString key( int, bool ) const; }; class K3bMovixSubTitleViewItem : public K3bMovixListViewItem, public KFileItem { public: - K3bMovixSubTitleViewItem( K3bMovixDoc*, K3bMovixFileItem* item, K3bMovixListViewItem* parent ); + K3bMovixSubTitleViewItem( K3bMovixDoc*, K3bMovixFileItem* item, K3bMovixListViewItem* tqparent ); ~K3bMovixSubTitleViewItem(); - QString text( int ) const; + TQString text( int ) const; bool isMovixFileItem() const { return false; } }; @@ -74,27 +74,28 @@ class K3bMovixSubTitleViewItem : public K3bMovixListViewItem, public KFileItem class K3bMovixListView : public K3bListView { Q_OBJECT + TQ_OBJECT public: - K3bMovixListView( K3bMovixDoc* doc, QWidget* parent = 0, const char* name = 0 ); + K3bMovixListView( K3bMovixDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); ~K3bMovixListView(); - QDragObject* dragObject(); + TQDragObject* dragObject(); protected: - bool acceptDrag(QDropEvent* e) const; + bool acceptDrag(TQDropEvent* e) const; private slots: void slotNewFileItems(); void slotFileItemRemoved( K3bMovixFileItem* ); void slotSubTitleItemRemoved( K3bMovixFileItem* ); - void slotDropped( KListView*, QDropEvent* e, QListViewItem* after ); + void slotDropped( KListView*, TQDropEvent* e, TQListViewItem* after ); void slotChanged(); private: K3bMovixDoc* m_doc; - QMap<K3bFileItem*, K3bMovixFileViewItem*> m_itemMap; + TQMap<K3bFileItem*, K3bMovixFileViewItem*> m_itemMap; }; #endif diff --git a/src/projects/k3bmovixoptionswidget.cpp b/src/projects/k3bmovixoptionswidget.cpp index 131af6b..d1aca71 100644 --- a/src/projects/k3bmovixoptionswidget.cpp +++ b/src/projects/k3bmovixoptionswidget.cpp @@ -24,29 +24,29 @@ #include <kglobal.h> #include <kdebug.h> -#include <qcheckbox.h> -#include <qspinbox.h> -#include <qstringlist.h> -#include <qmap.h> -#include <qlabel.h> +#include <tqcheckbox.h> +#include <tqspinbox.h> +#include <tqstringlist.h> +#include <tqmap.h> +#include <tqlabel.h> class K3bMovixOptionsWidget::LanguageSelectionHelper { public: - LanguageSelectionHelper( QComboBox* box ) + LanguageSelectionHelper( TQComboBox* box ) : m_box(box) { } - void insertLanguages( const QStringList& langs ) { + void insertLanguages( const TQStringList& langs ) { m_box->clear(); m_langMap.clear(); - for( QStringList::const_iterator it = langs.begin(); it != langs.end(); ++it ) { + for( TQStringList::const_iterator it = langs.begin(); it != langs.end(); ++it ) { if( *it == i18n("default") ) m_box->insertItem( *it ); else { - QString lang = KGlobal::locale()->twoAlphaToLanguageName( *it ); + TQString lang = KGlobal::locale()->twoAlphaToLanguageName( *it ); if( lang.isEmpty() ) lang = *it; @@ -57,15 +57,15 @@ public: } } - QString selectedLanguage() const { + TQString selectedLanguage() const { if( m_box->currentItem() == 0 ) return i18n("default"); else return m_langMap[m_box->currentItem()]; } - void setLanguage( const QString& l ) { - QMap<QString,int>::const_iterator it = m_indexMap.find(l); + void setLanguage( const TQString& l ) { + TQMap<TQString,int>::const_iterator it = m_indexMap.tqfind(l); if( it == m_indexMap.end() ) m_box->setCurrentItem( 0 ); else @@ -73,14 +73,14 @@ public: } private: - QComboBox* m_box; - QMap<int,QString> m_langMap; - QMap<QString,int> m_indexMap; + TQComboBox* m_box; + TQMap<int,TQString> m_langMap; + TQMap<TQString,int> m_indexMap; }; -K3bMovixOptionsWidget::K3bMovixOptionsWidget( QWidget* parent, const char* name ) - : base_K3bMovixOptionsWidget( parent, name ) +K3bMovixOptionsWidget::K3bMovixOptionsWidget( TQWidget* tqparent, const char* name ) + : base_K3bMovixOptionsWidget( tqparent, name ) { m_keyboardLangHelper = new LanguageSelectionHelper( m_comboKeyboardLayout ); m_helpLangHelper = new LanguageSelectionHelper( m_comboBootMessageLanguage ); @@ -151,8 +151,8 @@ void K3bMovixOptionsWidget::loadDefaults() m_comboAudioBackground->setCurrentItem( 0 ); // default m_comboKeyboardLayout->setCurrentItem( 0 ); // default m_spinLoop->setValue( 1 ); - m_editAdditionalMplayerOptions->setText( QString::null ); - m_editUnwantedMplayerOptions->setText( QString::null ); + m_editAdditionalMplayerOptions->setText( TQString() ); + m_editUnwantedMplayerOptions->setText( TQString() ); m_comboBootMessageLanguage->setCurrentItem( 0 ); // default m_comboDefaultBootLabel->setCurrentItem( 0 ); // default m_checkShutdown->setChecked( false ); @@ -165,7 +165,7 @@ void K3bMovixOptionsWidget::loadDefaults() void K3bMovixOptionsWidget::loadConfig( KConfigBase* c ) { - QString s = c->readEntry("subtitle_fontset"); + TQString s = c->readEntry("subtitle_fontset"); if( !s.isEmpty() && s != "none" && m_comboSubtitleFontset->contains(s) ) m_comboSubtitleFontset->setCurrentItem( s, false ); else @@ -176,7 +176,7 @@ void K3bMovixOptionsWidget::loadConfig( KConfigBase* c ) m_editUnwantedMplayerOptions->setText( c->readEntry( "unwanted_mplayer_options" ) ); s = c->readEntry("boot_message_language"); - m_helpLangHelper->setLanguage( s == "default" ? QString::null : s ); + m_helpLangHelper->setLanguage( s == "default" ? TQString() : s ); s = c->readEntry( "default_boot_label" ); if( !s.isEmpty() && s != "default" && m_comboDefaultBootLabel->contains(s) ) @@ -191,7 +191,7 @@ void K3bMovixOptionsWidget::loadConfig( KConfigBase* c ) m_comboAudioBackground->setCurrentItem( 0 ); // default s = c->readEntry("keyboard_layout"); - m_keyboardLangHelper->setLanguage( s == "default" ? QString::null : s ); + m_keyboardLangHelper->setLanguage( s == "default" ? TQString() : s ); m_checkShutdown->setChecked( c->readBoolEntry( "shutdown", false) ); m_checkReboot->setChecked( c->readBoolEntry( "reboot", false ) ); diff --git a/src/projects/k3bmovixoptionswidget.h b/src/projects/k3bmovixoptionswidget.h index 3b9e367..76437f7 100644 --- a/src/projects/k3bmovixoptionswidget.h +++ b/src/projects/k3bmovixoptionswidget.h @@ -27,9 +27,10 @@ class KConfigBase; class K3bMovixOptionsWidget : public base_K3bMovixOptionsWidget { Q_OBJECT + TQ_OBJECT public: - K3bMovixOptionsWidget( QWidget* parent = 0, const char* name = 0 ); + K3bMovixOptionsWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bMovixOptionsWidget(); public slots: diff --git a/src/projects/k3bmovixview.cpp b/src/projects/k3bmovixview.cpp index 825b10b..45a30ff 100644 --- a/src/projects/k3bmovixview.cpp +++ b/src/projects/k3bmovixview.cpp @@ -33,34 +33,34 @@ #include <kmessagebox.h> #include <kurl.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qlineedit.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqlineedit.h> -K3bMovixView::K3bMovixView( K3bMovixDoc* doc, QWidget* parent, const char* name ) - : K3bView( doc, parent, name ), +K3bMovixView::K3bMovixView( K3bMovixDoc* doc, TQWidget* tqparent, const char* name ) + : K3bView( doc, tqparent, name ), m_doc(doc) { m_listView = new K3bMovixListView( m_doc, this ); setMainWidget( m_listView ); - connect( m_listView, SIGNAL(contextMenuRequested( QListViewItem*, const QPoint& , int )), - this, SLOT(slotContextMenuRequested(QListViewItem*, const QPoint& , int )) ); + connect( m_listView, TQT_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint& , int )), + this, TQT_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint& , int )) ); // setup actions m_actionProperties = new KAction( i18n("Properties"), "misc", - 0, this, SLOT(showPropertiesDialog()), + 0, TQT_TQOBJECT(this), TQT_SLOT(showPropertiesDialog()), actionCollection(), "movix_show_props" ); m_actionRemove = new KAction( i18n( "Remove" ), "editdelete", - Key_Delete, this, SLOT(slotRemoveItems()), + Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItems()), actionCollection(), "movix_remove_item" ); m_actionRemoveSubTitle = new KAction( i18n( "Remove Subtitle File" ), "editdelete", - 0, this, SLOT(slotRemoveSubTitleItems()), + 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveSubTitleItems()), actionCollection(), "movix_remove_subtitle_item" ); m_actionAddSubTitle = new KAction( i18n("Add Subtitle File..."), "", - 0, this, SLOT(slotAddSubTitleFile()), + 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSubTitleFile()), actionCollection(), "movix_add_subtitle" ); m_popupMenu = new KPopupMenu( this ); @@ -77,15 +77,15 @@ K3bMovixView::K3bMovixView( K3bMovixDoc* doc, QWidget* parent, const char* name toolBox()->addStretch(); - m_volumeIDEdit = new QLineEdit( doc->isoOptions().volumeID(), toolBox() ); + m_volumeIDEdit = new TQLineEdit( doc->isoOptions().volumeID(), toolBox() ); toolBox()->addLabel( i18n("Volume Name:") ); toolBox()->addSpacing(); toolBox()->addWidget( m_volumeIDEdit ); - connect( m_volumeIDEdit, SIGNAL(textChanged(const QString&)), + connect( m_volumeIDEdit, TQT_SIGNAL(textChanged(const TQString&)), m_doc, - SLOT(setVolumeID(const QString&)) ); + TQT_SLOT(setVolumeID(const TQString&)) ); - connect( m_doc, SIGNAL(changed()), this, SLOT(slotDocChanged()) ); + connect( m_doc, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotDocChanged()) ); } @@ -94,7 +94,7 @@ K3bMovixView::~K3bMovixView() } -void K3bMovixView::slotContextMenuRequested(QListViewItem* item, const QPoint& p, int ) +void K3bMovixView::slotContextMenuRequested(TQListViewItem* item, const TQPoint& p, int ) { if( item ) { m_actionRemove->setEnabled(true); @@ -129,8 +129,8 @@ void K3bMovixView::showPropertiesDialog() void K3bMovixView::slotRemoveItems() { - QPtrList<QListViewItem> list = m_listView->selectedItems(); - QPtrListIterator<QListViewItem> it(list); + TQPtrList<TQListViewItem> list = m_listView->selectedItems(); + TQPtrListIterator<TQListViewItem> it(list); if( list.isEmpty() ) kdDebug() << "nothing to remove" << endl; @@ -147,8 +147,8 @@ void K3bMovixView::slotRemoveItems() void K3bMovixView::slotRemoveSubTitleItems() { - QPtrList<QListViewItem> list = m_listView->selectedItems(); - QPtrListIterator<QListViewItem> it(list); + TQPtrList<TQListViewItem> list = m_listView->selectedItems(); + TQPtrListIterator<TQListViewItem> it(list); if( list.isEmpty() ) kdDebug() << "nothing to remove" << endl; @@ -162,7 +162,7 @@ void K3bMovixView::slotRemoveSubTitleItems() void K3bMovixView::slotAddSubTitleFile() { - QListViewItem* item = m_listView->selectedItems().first(); + TQListViewItem* item = m_listView->selectedItems().first(); if( K3bMovixListViewItem* vi = dynamic_cast<K3bMovixListViewItem*>(item) ) { KURL url = KFileDialog::getOpenURL(); @@ -176,9 +176,9 @@ void K3bMovixView::slotAddSubTitleFile() } -K3bProjectBurnDialog* K3bMovixView::newBurnDialog( QWidget* parent, const char* name ) +K3bProjectBurnDialog* K3bMovixView::newBurnDialog( TQWidget* tqparent, const char* name ) { - return new K3bMovixBurnDialog( m_doc, parent, name, true ); + return new K3bMovixBurnDialog( m_doc, tqparent, name, true ); } diff --git a/src/projects/k3bmovixview.h b/src/projects/k3bmovixview.h index e174b64..3f07c68 100644 --- a/src/projects/k3bmovixview.h +++ b/src/projects/k3bmovixview.h @@ -24,21 +24,22 @@ class K3bMovixDoc; class K3bMovixListView; class KAction; class KPopupMenu; -class QListViewItem; -class QPoint; -class QLineEdit; +class TQListViewItem; +class TQPoint; +class TQLineEdit; class K3bMovixView : public K3bView { Q_OBJECT + TQ_OBJECT public: - K3bMovixView( K3bMovixDoc* doc, QWidget* parent = 0, const char* name = 0 ); + K3bMovixView( K3bMovixDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); virtual ~K3bMovixView(); private slots: - void slotContextMenuRequested(QListViewItem*, const QPoint& , int ); + void slotContextMenuRequested(TQListViewItem*, const TQPoint& , int ); void slotRemoveItems(); void slotRemoveSubTitleItems(); void showPropertiesDialog(); @@ -46,7 +47,7 @@ class K3bMovixView : public K3bView void slotDocChanged(); protected: - virtual K3bProjectBurnDialog* newBurnDialog( QWidget* parent = 0, const char* name = 0 ); + virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); K3bMovixListView* m_listView; @@ -59,7 +60,7 @@ class K3bMovixView : public K3bView KAction* m_actionAddSubTitle; KPopupMenu* m_popupMenu; - QLineEdit* m_volumeIDEdit; + TQLineEdit* m_volumeIDEdit; }; #endif diff --git a/src/projects/k3bmusicbrainzjob.cpp b/src/projects/k3bmusicbrainzjob.cpp index b52c766..3b1964b 100644 --- a/src/projects/k3bmusicbrainzjob.cpp +++ b/src/projects/k3bmusicbrainzjob.cpp @@ -43,7 +43,7 @@ public: } void run(); void cancel(); - const QCString& signature() const { + const TQCString& signature() const { return m_trm.signature(); } @@ -63,7 +63,7 @@ public: void run(); - void setSignature( const QCString& sig ) { + void setSignature( const TQCString& sig ) { m_sig = sig; } @@ -71,18 +71,18 @@ public: return m_results; } - const QString& title( unsigned int i = 0 ) const { + const TQString& title( unsigned int i = 0 ) const { return m_mb.title( i ); } - const QString& artist( unsigned int i = 0 ) const { + const TQString& artist( unsigned int i = 0 ) const { return m_mb.artist( i ); } private: K3bMusicBrainz m_mb; int m_results; - QCString m_sig; + TQCString m_sig; }; @@ -152,9 +152,9 @@ void K3bMusicBrainzJob::MusicBrainzThread::run() -// cannot use this as parent for the K3bSimpleJobHandler since this has not been constructed yet -K3bMusicBrainzJob::K3bMusicBrainzJob( QWidget* parent, const char* name ) - : K3bJob( new K3bSimpleJobHandler( 0 ), parent, name ), +// cannot use this as tqparent for the K3bSimpleJobHandler since this has not been constructed yet +K3bMusicBrainzJob::K3bMusicBrainzJob( TQWidget* tqparent, const char* name ) + : K3bJob( new K3bSimpleJobHandler( 0 ), tqparent, name ), m_canceled( false ) { m_trmThread = new TRMThread(); @@ -162,10 +162,10 @@ K3bMusicBrainzJob::K3bMusicBrainzJob( QWidget* parent, const char* name ) m_trmJob = new K3bThreadJob( m_trmThread, this, this ); m_mbJob = new K3bThreadJob( m_mbThread, this, this ); - connect( m_trmJob, SIGNAL(percent(int)), this, SIGNAL(subPercent(int)) ); - connect( m_trmJob, SIGNAL(percent(int)), this, SLOT(slotTrmPercent(int)) ); - connect( m_trmJob, SIGNAL(finished(bool)), this, SLOT(slotTrmJobFinished(bool)) ); - connect( m_mbJob, SIGNAL(finished(bool)), this, SLOT(slotMbJobFinished(bool)) ); + connect( m_trmJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(subPercent(int)) ); + connect( m_trmJob, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotTrmPercent(int)) ); + connect( m_trmJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotTrmJobFinished(bool)) ); + connect( m_mbJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotMbJobFinished(bool)) ); } @@ -188,7 +188,7 @@ void K3bMusicBrainzJob::start() m_trmThread->track = m_tracks.first(); emit infoMessage( i18n("Generating fingerprint for track %1.") - .arg(m_tracks.current()->trackNumber()), INFO ); + .tqarg(m_tracks.current()->trackNumber()), INFO ); m_trmJob->start(); } @@ -215,7 +215,7 @@ void K3bMusicBrainzJob::slotTrmJobFinished( bool success ) // now query musicbrainz m_mbThread->setSignature( m_trmThread->signature() ); emit infoMessage( i18n("Querying MusicBrainz for track %1.") - .arg(m_tracks.current()->trackNumber()), INFO ); + .tqarg(m_tracks.current()->trackNumber()), INFO ); m_mbJob->start(); } else { @@ -237,29 +237,29 @@ void K3bMusicBrainzJob::slotMbJobFinished( bool success ) if( success ) { // found entries - QStringList resultStrings, resultStringsUnique; + TQStringList resultStrings, resultStringsUnique; for( unsigned int i = 0; i < m_mbThread->results(); ++i ) resultStrings.append( m_mbThread->artist(i) + " - " + m_mbThread->title(i) ); // since we are only using the title and the artist a lot of entries are alike to us // so to not let the user have to choose between two equal entries we trim the list down - for( QStringList::const_iterator it = resultStrings.begin(); + for( TQStringList::const_iterator it = resultStrings.begin(); it != resultStrings.end(); ++it ) - if( resultStringsUnique.find( *it ) == resultStringsUnique.end() ) + if( resultStringsUnique.tqfind( *it ) == resultStringsUnique.end() ) resultStringsUnique.append( *it ); - QString s; + TQString s; bool ok = true; if( resultStringsUnique.count() > 1 ) s = KInputDialog::getItem( i18n("MusicBrainz Query"), i18n("Found multiple matches for track %1 (%2). Please select one.") - .arg(m_tracks.current()->trackNumber()) - .arg(m_tracks.current()->firstSource()->sourceComment()), + .tqarg(m_tracks.current()->trackNumber()) + .tqarg(m_tracks.current()->firstSource()->sourceComment()), resultStringsUnique, 0, false, &ok, - dynamic_cast<QWidget*>(parent()) ); + dynamic_cast<TQWidget*>(tqparent()) ); else s = resultStringsUnique.first(); @@ -273,7 +273,7 @@ void K3bMusicBrainzJob::slotMbJobFinished( bool success ) // query next track if( m_tracks.next() ) { emit infoMessage( i18n("Generating fingerprint for track %1.") - .arg(m_tracks.current()->trackNumber()), INFO ); + .tqarg(m_tracks.current()->trackNumber()), INFO ); m_trmThread->track = m_tracks.current(); m_trmJob->start(); } diff --git a/src/projects/k3bmusicbrainzjob.h b/src/projects/k3bmusicbrainzjob.h index 5007a47..4b5a16b 100644 --- a/src/projects/k3bmusicbrainzjob.h +++ b/src/projects/k3bmusicbrainzjob.h @@ -27,7 +27,7 @@ class K3bAudioTrack; class K3bThreadJob; -class QWidget; +class TQWidget; /** @@ -37,13 +37,14 @@ class QWidget; class K3bMusicBrainzJob : public K3bJob { Q_OBJECT + TQ_OBJECT public: /** - * \param parent since we do not use this job with a normal progressdialog we need a widget - * as parent + * \param tqparent since we do not use this job with a normal progressdialog we need a widget + * as tqparent */ - K3bMusicBrainzJob( QWidget* parent = 0, const char* name = 0 ); + K3bMusicBrainzJob( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bMusicBrainzJob(); bool hasBeenCanceled() const { return m_canceled; } @@ -62,7 +63,7 @@ class K3bMusicBrainzJob : public K3bJob void start(); void cancel(); - void setTracks( const QPtrList<K3bAudioTrack>& tracks ) { m_tracks = tracks; } + void setTracks( const TQPtrList<K3bAudioTrack>& tracks ) { m_tracks = tracks; } private slots: void slotTrmPercent( int p ); @@ -78,7 +79,7 @@ class K3bMusicBrainzJob : public K3bJob K3bThreadJob* m_trmJob; K3bThreadJob* m_mbJob; - QPtrList<K3bAudioTrack> m_tracks; + TQPtrList<K3bAudioTrack> m_tracks; bool m_canceled; }; diff --git a/src/projects/k3bprojectburndialog.cpp b/src/projects/k3bprojectburndialog.cpp index 09444b0..419e3a3 100644 --- a/src/projects/k3bprojectburndialog.cpp +++ b/src/projects/k3bprojectburndialog.cpp @@ -27,17 +27,17 @@ #include <k3bglobals.h> #include <k3bcore.h> -#include <qstring.h> -#include <qpushbutton.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qvbox.h> -#include <qcheckbox.h> -#include <qtabwidget.h> -#include <qgroupbox.h> -#include <qspinbox.h> -#include <qlabel.h> +#include <tqstring.h> +#include <tqpushbutton.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqvbox.h> +#include <tqcheckbox.h> +#include <tqtabwidget.h> +#include <tqgroupbox.h> +#include <tqspinbox.h> +#include <tqlabel.h> #include <klocale.h> #include <kconfig.h> @@ -51,8 +51,8 @@ #include <kiconloader.h> -K3bProjectBurnDialog::K3bProjectBurnDialog( K3bDoc* doc, QWidget *parent, const char *name, bool modal, bool dvd ) - : K3bInteractionDialog( parent, name, i18n("Project"), QString::null, +K3bProjectBurnDialog::K3bProjectBurnDialog( K3bDoc* doc, TQWidget *tqparent, const char *name, bool modal, bool dvd ) + : K3bInteractionDialog( tqparent, name, i18n("Project"), TQString(), START_BUTTON|SAVE_BUTTON|CANCEL_BUTTON, START_BUTTON, "default " + doc->typeString() + " settings", modal ), m_writerSelectionWidget(0), @@ -197,12 +197,12 @@ void K3bProjectBurnDialog::slotStartClicked() // // check if the temp dir exists // - QString tempDir = m_tempDirSelectionWidget->tempDirectory(); - if( !QFile::exists( tempDir ) ) { - if( KMessageBox::warningYesNo( this, i18n("Image folder '%1' does not exist. Do you want K3b to create it?").arg( tempDir ) ) + TQString tempDir = m_tempDirSelectionWidget->tempDirectory(); + if( !TQFile::exists( tempDir ) ) { + if( KMessageBox::warningYesNo( this, i18n("Image folder '%1' does not exist. Do you want K3b to create it?").tqarg( tempDir ) ) == KMessageBox::Yes ) { if( !KStandardDirs::makeDir( tempDir ) ) { - KMessageBox::error( this, i18n("Failed to create folder '%1'.").arg( tempDir ) ); + KMessageBox::error( this, i18n("Failed to create folder '%1'.").tqarg( tempDir ) ); return; } } @@ -223,9 +223,9 @@ void K3bProjectBurnDialog::slotStartClicked() K3bJobProgressDialog* dlg = 0; if( m_checkOnlyCreateImage && m_checkOnlyCreateImage->isChecked() ) - dlg = new K3bJobProgressDialog( parentWidget() ); + dlg = new K3bJobProgressDialog( tqparentWidget() ); else - dlg = new K3bBurnProgressDialog( parentWidget() ); + dlg = new K3bBurnProgressDialog( tqparentWidget() ); m_job = m_doc->newBurnJob( dlg ); @@ -250,7 +250,7 @@ void K3bProjectBurnDialog::slotStartClicked() void K3bProjectBurnDialog::prepareGui() { - QVBoxLayout* mainLay = new QVBoxLayout( mainWidget() ); + TQVBoxLayout* mainLay = new TQVBoxLayout( mainWidget() ); mainLay->setAutoAdd( true ); mainLay->setMargin( 0 ); mainLay->setSpacing( KDialog::spacingHint() ); @@ -259,19 +259,19 @@ void K3bProjectBurnDialog::prepareGui() m_writerSelectionWidget->setWantedMediumType( m_dvd ? K3bDevice::MEDIA_WRITABLE_DVD : K3bDevice::MEDIA_WRITABLE_CD ); m_writerSelectionWidget->setWantedMediumState( K3bDevice::STATE_EMPTY ); - m_tabWidget = new QTabWidget( mainWidget() ); + m_tabWidget = new TQTabWidget( mainWidget() ); - QWidget* w = new QWidget( m_tabWidget ); + TQWidget* w = new TQWidget( m_tabWidget ); m_tabWidget->addTab( w, i18n("Writing") ); - QGroupBox* groupWritingMode = new QGroupBox( 1, Qt::Vertical, i18n("Writing Mode"), w ); + TQGroupBox* groupWritingMode = new TQGroupBox( 1, Qt::Vertical, i18n("Writing Mode"), w ); groupWritingMode->setInsideMargin( marginHint() ); m_writingModeWidget = new K3bWritingModeWidget( groupWritingMode ); - m_optionGroup = new QGroupBox( 0, Qt::Vertical, i18n("Settings"), w ); - m_optionGroup->layout()->setMargin(0); - m_optionGroup->layout()->setSpacing(0); - m_optionGroupLayout = new QVBoxLayout( m_optionGroup->layout() ); + m_optionGroup = new TQGroupBox( 0, Qt::Vertical, i18n("Settings"), w ); + m_optionGroup->tqlayout()->setMargin(0); + m_optionGroup->tqlayout()->setSpacing(0); + m_optionGroupLayout = new TQVBoxLayout( m_optionGroup->tqlayout() ); m_optionGroupLayout->setMargin( KDialog::marginHint() ); m_optionGroupLayout->setSpacing( KDialog::spacingHint() ); @@ -286,16 +286,16 @@ void K3bProjectBurnDialog::prepareGui() m_optionGroupLayout->addWidget(m_checkOnlyCreateImage); m_optionGroupLayout->addWidget(m_checkRemoveBufferFiles); - QGroupBox* groupCopies = new QGroupBox( 2, Qt::Horizontal, i18n("Copies"), w ); + TQGroupBox* groupCopies = new TQGroupBox( 2, Qt::Horizontal, i18n("Copies"), w ); groupCopies->setInsideSpacing( spacingHint() ); groupCopies->setInsideMargin( marginHint() ); - QLabel* pixLabel = new QLabel( groupCopies ); + TQLabel* pixLabel = new TQLabel( groupCopies ); pixLabel->setPixmap( SmallIcon( "cdcopy", KIcon::SizeMedium ) ); pixLabel->setScaledContents( false ); - m_spinCopies = new QSpinBox( 1, 999, 1, groupCopies ); + m_spinCopies = new TQSpinBox( 1, 999, 1, groupCopies ); // arrange it - QGridLayout* grid = new QGridLayout( w ); + TQGridLayout* grid = new TQGridLayout( w ); grid->setMargin( KDialog::marginHint() ); grid->setSpacing( KDialog::spacingHint() ); @@ -306,8 +306,8 @@ void K3bProjectBurnDialog::prepareGui() grid->setRowStretch( 1, 1 ); grid->setColStretch( 1, 1 ); - QWidget* tempW = new QWidget( m_tabWidget ); - grid = new QGridLayout( tempW ); + TQWidget* tempW = new TQWidget( m_tabWidget ); + grid = new TQGridLayout( tempW ); grid->setMargin( KDialog::marginHint() ); grid->setSpacing( KDialog::spacingHint() ); m_tabWidget->addTab( tempW, i18n("Image") ); @@ -321,18 +321,18 @@ void K3bProjectBurnDialog::prepareGui() setTabOrder( groupCopies, m_optionGroup ); // some default connections that should always be useful - connect( m_writerSelectionWidget, SIGNAL(writerChanged()), this, SLOT(slotWriterChanged()) ); - connect( m_writerSelectionWidget, SIGNAL(writerChanged(K3bDevice::Device*)), - m_writingModeWidget, SLOT(determineSupportedModesFromMedium(K3bDevice::Device*)) ); - connect( m_writerSelectionWidget, SIGNAL(writingAppChanged(int)), this, SLOT(slotWritingAppChanged(int)) ); - connect( m_checkCacheImage, SIGNAL(toggled(bool)), this, SLOT(slotToggleAll()) ); - connect( m_checkSimulate, SIGNAL(toggled(bool)), this, SLOT(slotToggleAll()) ); - connect( m_checkOnlyCreateImage, SIGNAL(toggled(bool)), this, SLOT(slotToggleAll()) ); - connect( m_writingModeWidget, SIGNAL(writingModeChanged(int)), this, SLOT(slotToggleAll()) ); + connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged()), this, TQT_SLOT(slotWriterChanged()) ); + connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged(K3bDevice::Device*)), + m_writingModeWidget, TQT_SLOT(determineSupportedModesFromMedium(K3bDevice::Device*)) ); + connect( m_writerSelectionWidget, TQT_SIGNAL(writingAppChanged(int)), this, TQT_SLOT(slotWritingAppChanged(int)) ); + connect( m_checkCacheImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_checkSimulate, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_checkOnlyCreateImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_writingModeWidget, TQT_SIGNAL(writingModeChanged(int)), this, TQT_SLOT(slotToggleAll()) ); } -void K3bProjectBurnDialog::addPage( QWidget* page, const QString& title ) +void K3bProjectBurnDialog::addPage( TQWidget* page, const TQString& title ) { m_tabWidget->addTab( page, title ); } diff --git a/src/projects/k3bprojectburndialog.h b/src/projects/k3bprojectburndialog.h index f011ae8..2e7f32f 100644 --- a/src/projects/k3bprojectburndialog.h +++ b/src/projects/k3bprojectburndialog.h @@ -24,11 +24,11 @@ class K3bDoc; class K3bBurnJob; class K3bWriterSelectionWidget; class K3bTempDirSelectionWidget; -class QGroupBox; -class QCheckBox; -class QTabWidget; -class QSpinBox; -class QVBoxLayout; +class TQGroupBox; +class TQCheckBox; +class TQTabWidget; +class TQSpinBox; +class TQVBoxLayout; class K3bWritingModeWidget; class KConfigBase; @@ -39,9 +39,10 @@ class KConfigBase; class K3bProjectBurnDialog : public K3bInteractionDialog { Q_OBJECT + TQ_OBJECT public: - K3bProjectBurnDialog( K3bDoc* doc, QWidget *parent=0, const char *name=0, + K3bProjectBurnDialog( K3bDoc* doc, TQWidget *tqparent=0, const char *name=0, bool modal = true, bool dvd = false ); ~K3bProjectBurnDialog(); @@ -162,7 +163,7 @@ class K3bProjectBurnDialog : public K3bInteractionDialog void prepareGui(); - void addPage( QWidget*, const QString& title ); + void addPage( TQWidget*, const TQString& title ); /** * Call this if you must reimplement it. @@ -173,18 +174,18 @@ class K3bProjectBurnDialog : public K3bInteractionDialog K3bWriterSelectionWidget* m_writerSelectionWidget; K3bTempDirSelectionWidget* m_tempDirSelectionWidget; K3bWritingModeWidget* m_writingModeWidget; - QGroupBox* m_optionGroup; - QVBoxLayout* m_optionGroupLayout; - QCheckBox* m_checkCacheImage; - QCheckBox* m_checkSimulate; - QCheckBox* m_checkRemoveBufferFiles; - QCheckBox* m_checkOnlyCreateImage; - QSpinBox* m_spinCopies; + TQGroupBox* m_optionGroup; + TQVBoxLayout* m_optionGroupLayout; + TQCheckBox* m_checkCacheImage; + TQCheckBox* m_checkSimulate; + TQCheckBox* m_checkRemoveBufferFiles; + TQCheckBox* m_checkOnlyCreateImage; + TQSpinBox* m_spinCopies; private: K3bDoc* m_doc; K3bBurnJob* m_job; - QTabWidget* m_tabWidget; + TQTabWidget* m_tabWidget; bool m_dvd; }; diff --git a/src/projects/k3bprojectplugindialog.cpp b/src/projects/k3bprojectplugindialog.cpp index a28f563..4a6d1fb 100644 --- a/src/projects/k3bprojectplugindialog.cpp +++ b/src/projects/k3bprojectplugindialog.cpp @@ -17,13 +17,13 @@ #include <k3bprojectplugin.h> -#include <qwidget.h> +#include <tqwidget.h> -K3bProjectPluginDialog::K3bProjectPluginDialog( K3bProjectPlugin* plugin, K3bDoc* doc, QWidget* parent, const char* name ) - : K3bInteractionDialog( parent, name, - QString::null, - QString::null, +K3bProjectPluginDialog::K3bProjectPluginDialog( K3bProjectPlugin* plugin, K3bDoc* doc, TQWidget* tqparent, const char* name ) + : K3bInteractionDialog( tqparent, name, + TQString(), + TQString(), START_BUTTON|CANCEL_BUTTON, START_BUTTON, plugin->className() ), diff --git a/src/projects/k3bprojectplugindialog.h b/src/projects/k3bprojectplugindialog.h index f2250d7..6a213fa 100644 --- a/src/projects/k3bprojectplugindialog.h +++ b/src/projects/k3bprojectplugindialog.h @@ -27,9 +27,10 @@ class KConfigBase; class K3bProjectPluginDialog : public K3bInteractionDialog { Q_OBJECT + TQ_OBJECT public: - K3bProjectPluginDialog( K3bProjectPlugin*, K3bDoc*, QWidget*, const char* name = 0 ); + K3bProjectPluginDialog( K3bProjectPlugin*, K3bDoc*, TQWidget*, const char* name = 0 ); ~K3bProjectPluginDialog(); protected slots: diff --git a/src/projects/k3bvcdburndialog.cpp b/src/projects/k3bvcdburndialog.cpp index 3c45c14..07c7b85 100644 --- a/src/projects/k3bvcdburndialog.cpp +++ b/src/projects/k3bvcdburndialog.cpp @@ -13,19 +13,19 @@ * See the file "COPYING" for the exact licensing terms. */ -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qspinbox.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qgrid.h> -#include <qtoolbutton.h> -#include <qfileinfo.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> +#include <tqspinbox.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqgrid.h> +#include <tqtoolbutton.h> +#include <tqfileinfo.h> #include <klocale.h> #include <kconfig.h> @@ -47,14 +47,14 @@ #include <k3bexternalbinmanager.h> #include <k3bvalidators.h> -K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, QWidget *parent, const char *name, bool modal ) - : K3bProjectBurnDialog( _doc, parent, name, modal ) +K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, TQWidget *tqparent, const char *name, bool modal ) + : K3bProjectBurnDialog( _doc, tqparent, name, modal ) { m_vcdDoc = _doc; prepareGui(); - QString vcdType; + TQString vcdType; switch ( m_vcdDoc->vcdType() ) { case K3bVcdDoc::VCD11: vcdType = i18n( "Video CD (Version 1.1)" ); @@ -62,14 +62,14 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, QWidget *parent, const char vcdType = i18n( "Video CD (Version 2.0)" ); case K3bVcdDoc::SVCD10: vcdType = i18n( "Super Video CD" ); - case K3bVcdDoc::HQVCD: + case K3bVcdDoc::HTQVCD: vcdType = i18n( "High-Quality Video CD" ); default: vcdType = i18n( "Video CD" ); } setTitle( vcdType, i18n( "1 MPEG (%1)", "%n MPEGs (%1)", - m_vcdDoc->tracks() ->count() ).arg( KIO::convertSize( m_vcdDoc->size() ) ) ); + m_vcdDoc->tracks() ->count() ).tqarg( KIO::convertSize( m_vcdDoc->size() ) ) ); const K3bExternalBin* cdrecordBin = k3bcore->externalBinManager() ->binObject( "cdrecord" ); if ( cdrecordBin && cdrecordBin->hasFeature( "cuefile" ) ) @@ -79,77 +79,77 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, QWidget *parent, const char m_checkCacheImage->hide(); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); m_optionGroupLayout->addItem( spacer ); setupVideoCdTab(); setupLabelTab(); setupAdvancedTab(); - connect( m_spinVolumeCount, SIGNAL( valueChanged( int ) ), this, SLOT( slotSpinVolumeCount() ) ); - connect( m_groupVcdFormat, SIGNAL( clicked( int ) ), this, SLOT( slotVcdTypeClicked( int ) ) ); - connect( m_checkCdiSupport, SIGNAL( toggled( bool ) ), this, SLOT( slotCdiSupportChecked( bool ) ) ); - connect( m_checkAutoDetect, SIGNAL( toggled( bool ) ), this, SLOT( slotAutoDetect( bool ) ) ); - connect( m_checkGaps, SIGNAL( toggled( bool ) ), this, SLOT( slotGapsChecked( bool ) ) ); + connect( m_spinVolumeCount, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotSpinVolumeCount() ) ); + connect( m_groupVcdFormat, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotVcdTypeClicked( int ) ) ); + connect( m_checkCdiSupport, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotCdiSupportChecked( bool ) ) ); + connect( m_checkAutoDetect, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotAutoDetect( bool ) ) ); + connect( m_checkGaps, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotGapsChecked( bool ) ) ); // ToolTips // ------------------------------------------------------------------------- - QToolTip::add - ( m_radioVcd11, i18n( "Select Video CD type %1" ).arg( "(VCD 1.1)" ) ); - QToolTip::add - ( m_radioVcd20, i18n( "Select Video CD type %1" ).arg( "(VCD 2.0)" ) ); - QToolTip::add - ( m_radioSvcd10, i18n( "Select Video CD type %1" ).arg( "(SVCD 1.0)" ) ); - QToolTip::add - ( m_radioHqVcd10, i18n( "Select Video CD type %1" ).arg( "(HQ-VCD 1.0)" ) ); - QToolTip::add + TQToolTip::add + ( m_radioVcd11, i18n( "Select Video CD type %1" ).tqarg( "(VCD 1.1)" ) ); + TQToolTip::add + ( m_radioVcd20, i18n( "Select Video CD type %1" ).tqarg( "(VCD 2.0)" ) ); + TQToolTip::add + ( m_radioSvcd10, i18n( "Select Video CD type %1" ).tqarg( "(SVCD 1.0)" ) ); + TQToolTip::add + ( m_radioHqVcd10, i18n( "Select Video CD type %1" ).tqarg( "(HQ-VCD 1.0)" ) ); + TQToolTip::add ( m_checkAutoDetect, i18n( "Automatic video type recognition." ) ); - QToolTip::add + TQToolTip::add ( m_checkNonCompliant, i18n( "Non-compliant compatibility mode for broken devices" ) ); - QToolTip::add + TQToolTip::add ( m_checkVCD30interpretation, i18n( "Chinese VCD3.0 track interpretation" ) ); - QToolTip::add + TQToolTip::add ( m_check2336, i18n( "Use 2336 byte sectors for output" ) ); - QToolTip::add + TQToolTip::add ( m_editVolumeId, i18n( "Specify ISO volume label for Video CD" ) ); - QToolTip::add + TQToolTip::add ( m_editAlbumId, i18n( "Specify album id for VideoCD set" ) ); - QToolTip::add + TQToolTip::add ( m_spinVolumeNumber, i18n( "Specify album set sequence number ( <= volume-count )" ) ); - QToolTip::add + TQToolTip::add ( m_spinVolumeCount, i18n( "Specify number of volumes in album set" ) ); - QToolTip::add + TQToolTip::add ( m_checkCdiSupport, i18n( "Enable CD-i Application Support for VideoCD Type 1.1 & 2.0" ) ); - QToolTip::add + TQToolTip::add ( m_editCdiCfg, i18n( "Configuration parameters (only for VCD 2.0)" ) ); - QToolTip::add + TQToolTip::add ( m_checkPbc, i18n( "Playback control, PBC, is available for Video CD 2.0 and Super Video CD 1.0 disc formats." ) ); - QToolTip::add + TQToolTip::add ( m_checkSegmentFolder, i18n( "Add always an empty `/SEGMENT' directory" ) ); - QToolTip::add + TQToolTip::add ( m_checkRelaxedAps, i18n( "This controls whether APS constraints are strict or relaxed. " ) ); - QToolTip::add + TQToolTip::add ( m_checkUpdateScanOffsets, i18n( "This controls whether to update the scan data information contained in the MPEG-2 video streams." ) ); - QToolTip::add + TQToolTip::add ( m_labelRestriction, i18n( "This element allows to set viewing restrictions which may be interpreted by the playing device." ) ); - QToolTip::add + TQToolTip::add ( m_checkGaps, i18n( "This option allows customization of Gaps and Margins." ) ); - QToolTip::add + TQToolTip::add ( m_labelPreGapLeadout, i18n( "Used to set the number of empty sectors added before the lead-out area begins." ) ); - QToolTip::add + TQToolTip::add ( m_labelPreGapTrack, i18n( "Used to set the track pre-gap for all tracks in sectors globally." ) ); - QToolTip::add + TQToolTip::add ( m_labelFrontMarginTrack, i18n( "Sets the front margin for sequence items." ) ); - QToolTip::add + TQToolTip::add ( m_labelRearMarginTrack, i18n( "Sets the rear margin for sequence items." ) ); // What's This info // ------------------------------------------------------------------------- - QWhatsThis::add + TQWhatsThis::add ( m_radioVcd11, i18n( "<p>This is the most basic <b>Video CD</b> specification dating back to 1993, which has the following characteristics:" "<ul><li>One mode2 mixed form ISO-9660 track containing file pointers to the information areas.</li>" "<li>Up to 98 multiplex-ed MPEG-1 audio/video streams or CD-DA audio tracks.</li>" @@ -161,7 +161,7 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, QWidget *parent, const char "<p>The CBR MPEG-1, layer II audio stream is fixed at 224 kbps with 1 stereo or 2 mono channels." "<p><b>It is recommended to keep the video bit-rate under 1151929.1 bps.</b>" ) ); - QWhatsThis::add + TQWhatsThis::add ( m_radioVcd20, i18n( "<p>About two years after the Video CD 1.1 specification came out, an improved <b>Video CD 2.0</b> standard was published in 1995." "<p>This one added the following items to the features already available in the Video CD 1.1 specification:" "<ul><li>Support for MPEG segment play items (<b>\"SPI\"</b>), consisting of still pictures, motion pictures and/or audio (only) streams was added.</li>" @@ -180,7 +180,7 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, QWidget *parent, const char "<p>Also the possibility to have audio only streams and still pictures was provided." "<p><b>The bit-rate of multiplex-ed streams should be kept under 174300 bytes/sec (except for single still picture items) in order to accommodate single speed drives.</b>" ) ); - QWhatsThis::add + TQWhatsThis::add ( m_radioSvcd10, i18n( "<p>With the upcoming of the DVD-V media, a new VCD standard had to be published in order to be able to keep up with technology, so the Super Video CD specification was called into life 1999." "<p>In the midst of 2000 a full subset of this <b>Super Video CD</b> specification was published as <b>IEC-62107</b>." "<p>As the most notable change over Video CD 2.0 is a switch from MPEG-1 CBR to MPEG-2 VBR encoding for the video stream was performed." @@ -194,7 +194,7 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, QWidget *parent, const char "<ul><li>480 x 480 @ 29.97 Hz (NTSC 2/3 D-2).</li>" "<li>480 x 576 @ 25 Hz (PAL 2/3 D-2).</li></ul>" ) ); - QWhatsThis::add + TQWhatsThis::add ( m_radioHqVcd10, i18n( "<p>This is actually just a minor variation defined in IEC-62107 on the Super Video CD 1.0 format for compatibility with current products in the market." "<p>It differs from the Super Video CD 1.0 format in the following items:" "<ul><li>The system profile tag field in <b>/SVCD/INFO.SVD</b> is set to <b>1</b> instead of <b>0</b>.</li>" @@ -202,59 +202,59 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, QWidget *parent, const char "<li><b>/EXT/SCANDATA.DAT</b> is mandatory instead of being optional.</li>" "<li><b>/SVCD/SEARCH.DAT</b> is optional instead of being mandatory.</li></ul>" ) ); - QWhatsThis::add + TQWhatsThis::add ( m_checkAutoDetect, i18n( "<p>If Autodetect is:</p>" "<ul><li>ON then K3b will set the correct VideoCD type.</li>" "<li>OFF then the correct VideoCD type needs to be set by the user.</li></ul>" "<p>If you are not sure about the correct VideoCD type, it is best to turn Autodetect ON.</p>" "<p>If you want to force the VideoCD type, you must turn Autodetect OFF. This is useful for some standalone DVD players without SVCD support.</p>" ) ); - QWhatsThis::add + TQWhatsThis::add ( m_checkNonCompliant, i18n( "<ul><li>Rename <b>\"/MPEG2\"</b> folder on SVCDs to (non-compliant) \"/MPEGAV\".</li>" "<li>Enables the use of the (deprecated) signature <b>\"ENTRYSVD\"</b> instead of <b>\"ENTRYVCD\"</b> for the file <b>\"/SVCD/ENTRY.SVD\"</b>.</li></ul>" ) ); - QWhatsThis::add + TQWhatsThis::add ( m_checkVCD30interpretation, i18n( "<ul><li>Enables the use of the (deprecated) Chinese <b>\"/SVCD/TRACKS.SVD\"</b> format which differs from the format defined in the <b>IEC-62107</b> specification.</li></ul>" "<p><b>The differences are most exposed on SVCDs containing more than one video track.</b>" ) ); - QWhatsThis::add + TQWhatsThis::add ( m_check2336, i18n( "<p>though most devices will have problems with such an out-of-specification media." "<p><b>You may want use this option for images longer than 80 minutes</b>" ) ); - QWhatsThis::add + TQWhatsThis::add ( m_checkCdiSupport, i18n( "<p>To allow the play of Video-CDs on a CD-i player, the Video-CD standard requires that a CD-i application program must be present." "<p>This program is designed to:" "<ul><li>provide full play back control as defined in the PSD of the standard</l>" "<li>be extremely simple to use and easy-to-learn for the end-user</li></ul>" "<p>The program runs on CD-i players equipped with the CDRTOS 1.1(.1) operating system and a Digital Video extension cartridge." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_editCdiCfg, i18n( "<p>Configuration parameters only available for VideoCD 2.0" "<p>The engine works perfectly well when used as-is." "<p>You have the option to configure the VCD application." - "<p>You can adapt the color and/or the shape of the cursor and lots more." ) ); + "<p>You can adapt the color and/or the tqshape of the cursor and lots more." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_checkPbc, i18n( "<p>Playback control, PBC, is available for Video CD 2.0 and Super Video CD 1.0 disc formats." "<p>PBC allows control of the playback of play items and the possibility of interaction with the user through the remote control or some other input device available." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_checkSegmentFolder, i18n( "<p>Here you can specify that the folder <b>SEGMENT</b> should always be present." "<p>Some DVD players need the folder to give a faultless rendition." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_checkRelaxedAps, i18n( "<p>An Access Point Sector, APS, is an MPEG video sector on the VCD/SVCD which is suitable to be jumped to directly." "<p>APS are required for entry points and scantables. APS have to fulfil the requirement to precede every I-frame by a GOP header which shall be preceded by a sequence header in its turn." "<p>The start codes of these 3 items are required to be contained all in the same MPEG pack/sector, thus forming a so-called access point sector." "<p>This requirement can be relaxed by enabling the relaxed aps option, i.e. every sector containing an I-frame will be regarded as an APS." "<p><b>Warning:</b> The sequence header is needed for a playing device to figure out display parameters, such as display resolution and frame rate, relaxing the aps requirement may lead to non-working entry points." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_checkUpdateScanOffsets, i18n( "<p>According to the specification, it is mandatory for Super Video CDs to encode scan information data into user data blocks in the picture layer of all intra coded picture." "<p>It can be used by playing devices for implementing fast forward & fast reverse scanning." "<p>The already existing scan information data can be updated by enabling the update scan offsets option." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_labelRestriction, i18n( "<p>Viewing Restriction may be interpreted by the playing device." "<p>The allowed range goes from 0 to 3." "<ul><li>0 = unrestricted, free to view for all</li>" @@ -262,25 +262,25 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, QWidget *parent, const char "<p>Actually, the exact meaning is not defined and is player dependant." "<p><b>Most players ignore that value.<b>" ) ); - QWhatsThis::add + TQWhatsThis::add ( m_checkGaps, i18n( "<p>This option allows customization of Gaps and Margins." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_labelPreGapLeadout, i18n( "<p>This option allows to set the number of empty sectors added before the lead-out area begins, i.e. the number of post-gap sectors." "<p>The ECMA-130 specification requires the last data track before the lead-out to carry a post-gap of at least 150 sectors, which is used as default for this parameter." "<p>Some operating systems may encounter I/O errors due to read-ahead issues when reading the last MPEG track if this parameter is set too low." "<p>Allowed value content: [0..300]. Default: 150." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_labelPreGapTrack, i18n( "<p>Used to set the track pre-gap for all tracks in sectors globally." "<p>The specification requires the pre-gaps to be at least 150 sectors long." "<p>Allowed value content: [0..300]. Default: 150." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_labelFrontMarginTrack, i18n( "Margins are used to compensate for inaccurate sector-addressing issues on CD-ROM media. Interestingly, they have been abandoned for Super Video CDs." "<p>For Video CD 1.0/1.1/2.0 this margin should be at least 15 sectors long." "<p>Allowed value content: [0..150]. Default: 30 for Video CD 1.0/1.1/2.0, otherwise (i.e. Super Video CD 1.0 and HQ-VCD 1.0) 0." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_labelRearMarginTrack, i18n( "<p>Margins are used to compensate for inaccurate sector-addressing issues on CD-ROM media. Interestingly, they have been abandoned for Super Video CDs." "<p>For Video CD 1.0/1.1/2.0 this margin should be at least 15 sectors long." "<p>Allowed value content: [0..150]. Default: 45 for Video CD 1.0/1.1/2.0, otherwise 0." ) ); @@ -293,52 +293,52 @@ K3bVcdBurnDialog::~K3bVcdBurnDialog() void K3bVcdBurnDialog::setupAdvancedTab() { - QWidget * w = new QWidget( this ); + TQWidget * w = new TQWidget( this ); // ---------------------------------------------------- generic group ---- - m_groupGeneric = new QGroupBox( 5, Qt::Vertical, i18n( "Generic" ), w ); + m_groupGeneric = new TQGroupBox( 5, Qt::Vertical, i18n( "Generic" ), w ); - m_checkPbc = new QCheckBox( i18n( "Playback Control (PBC)" ), m_groupGeneric ); - m_checkSegmentFolder = new QCheckBox( i18n( "SEGMENT Folder must always be present" ), m_groupGeneric ); - m_checkRelaxedAps = new QCheckBox( i18n( "Relaxed aps" ), m_groupGeneric ); - m_checkUpdateScanOffsets = new QCheckBox( i18n( "Update scan offsets" ), m_groupGeneric ); + m_checkPbc = new TQCheckBox( i18n( "Playback Control (PBC)" ), m_groupGeneric ); + m_checkSegmentFolder = new TQCheckBox( i18n( "SEGMENT Folder must always be present" ), m_groupGeneric ); + m_checkRelaxedAps = new TQCheckBox( i18n( "Relaxed aps" ), m_groupGeneric ); + m_checkUpdateScanOffsets = new TQCheckBox( i18n( "Update scan offsets" ), m_groupGeneric ); m_checkUpdateScanOffsets->setEnabled( false ); // -------------------------------------------- gaps & margins group ---- - m_groupGaps = new QGroupBox( 0, Qt::Vertical, i18n( "Gaps" ), w ); - m_groupGaps->layout() ->setSpacing( spacingHint() ); - m_groupGaps->layout() ->setMargin( marginHint() ); + m_groupGaps = new TQGroupBox( 0, Qt::Vertical, i18n( "Gaps" ), w ); + m_groupGaps->tqlayout() ->setSpacing( spacingHint() ); + m_groupGaps->tqlayout() ->setMargin( marginHint() ); - QGridLayout* groupGapsLayout = new QGridLayout( m_groupGaps->layout() ); - groupGapsLayout->setAlignment( Qt::AlignTop ); + TQGridLayout* groupGapsLayout = new TQGridLayout( m_groupGaps->tqlayout() ); + groupGapsLayout->tqsetAlignment( TQt::AlignTop ); - m_checkGaps = new QCheckBox( i18n( "Customize gaps and margins" ), m_groupGaps ); + m_checkGaps = new TQCheckBox( i18n( "Customize gaps and margins" ), m_groupGaps ); - m_labelPreGapLeadout = new QLabel( i18n( "Leadout pre gap (0..300):" ), m_groupGaps, "labelPreGapLeadout" ); - m_spinPreGapLeadout = new QSpinBox( m_groupGaps, "m_spinPreGapLeadout" ); + m_labelPreGapLeadout = new TQLabel( i18n( "Leadout pre gap (0..300):" ), m_groupGaps, "labelPreGapLeadout" ); + m_spinPreGapLeadout = new TQSpinBox( m_groupGaps, "m_spinPreGapLeadout" ); m_spinPreGapLeadout->setMinValue( 0 ); m_spinPreGapLeadout->setMaxValue( 300 ); - m_labelPreGapTrack = new QLabel( i18n( "Track pre gap (0..300):" ), m_groupGaps, "labelPreGapTrack" ); - m_spinPreGapTrack = new QSpinBox( m_groupGaps, "m_spinPreGapTrack" ); + m_labelPreGapTrack = new TQLabel( i18n( "Track pre gap (0..300):" ), m_groupGaps, "labelPreGapTrack" ); + m_spinPreGapTrack = new TQSpinBox( m_groupGaps, "m_spinPreGapTrack" ); m_spinPreGapTrack->setMinValue( 0 ); m_spinPreGapTrack->setMaxValue( 300 ); - m_labelFrontMarginTrack = new QLabel( i18n( "Track front margin (0..150):" ), m_groupGaps, "labelFrontMarginTrack" ); - m_spinFrontMarginTrack = new QSpinBox( m_groupGaps, "m_spinFrontMarginTrack" ); + m_labelFrontMarginTrack = new TQLabel( i18n( "Track front margin (0..150):" ), m_groupGaps, "labelFrontMarginTrack" ); + m_spinFrontMarginTrack = new TQSpinBox( m_groupGaps, "m_spinFrontMarginTrack" ); m_spinFrontMarginTrack->setMinValue( 0 ); m_spinFrontMarginTrack->setMaxValue( 150 ); - m_spinFrontMarginTrackSVCD = new QSpinBox( m_groupGaps, "m_spinFrontMarginTrackSVCD" ); + m_spinFrontMarginTrackSVCD = new TQSpinBox( m_groupGaps, "m_spinFrontMarginTrackSVCD" ); m_spinFrontMarginTrackSVCD->setMinValue( 0 ); m_spinFrontMarginTrackSVCD->setMaxValue( 150 ); m_spinFrontMarginTrackSVCD->setHidden( true ); - m_labelRearMarginTrack = new QLabel( i18n( "Track rear margin (0..150):" ), m_groupGaps, "labelRearMarginTrack" ); - m_spinRearMarginTrack = new QSpinBox( m_groupGaps, "m_spinRearMarginTrack" ); + m_labelRearMarginTrack = new TQLabel( i18n( "Track rear margin (0..150):" ), m_groupGaps, "labelRearMarginTrack" ); + m_spinRearMarginTrack = new TQSpinBox( m_groupGaps, "m_spinRearMarginTrack" ); m_spinRearMarginTrack->setMinValue( 0 ); m_spinRearMarginTrack->setMaxValue( 150 ); - m_spinRearMarginTrackSVCD = new QSpinBox( m_groupGaps, "m_spinRearMarginTrackSVCD" ); + m_spinRearMarginTrackSVCD = new TQSpinBox( m_groupGaps, "m_spinRearMarginTrackSVCD" ); m_spinRearMarginTrackSVCD->setMinValue( 0 ); m_spinRearMarginTrackSVCD->setMaxValue( 150 ); m_spinRearMarginTrackSVCD->setHidden( true ); @@ -402,15 +402,15 @@ void K3bVcdBurnDialog::setupAdvancedTab() groupGapsLayout->setRowStretch( 4, 0 ); // ------------------------------------------------------- misc group ---- - m_groupMisc = new QGroupBox( 0, Qt::Vertical, i18n( "Misc" ), w ); - m_groupMisc->layout() ->setSpacing( spacingHint() ); - m_groupMisc->layout() ->setMargin( marginHint() ); + m_groupMisc = new TQGroupBox( 0, Qt::Vertical, i18n( "Misc" ), w ); + m_groupMisc->tqlayout() ->setSpacing( spacingHint() ); + m_groupMisc->tqlayout() ->setMargin( marginHint() ); - QGridLayout* groupMiscLayout = new QGridLayout( m_groupMisc->layout() ); - groupMiscLayout->setAlignment( Qt::AlignTop ); + TQGridLayout* groupMiscLayout = new TQGridLayout( m_groupMisc->tqlayout() ); + groupMiscLayout->tqsetAlignment( TQt::AlignTop ); - m_labelRestriction = new QLabel( i18n( "Restriction category (0..3):" ), m_groupMisc, "m_labelRestriction" ); - m_spinRestriction = new QSpinBox( m_groupMisc, "m_spinRestriction" ); + m_labelRestriction = new TQLabel( i18n( "Restriction category (0..3):" ), m_groupMisc, "m_labelRestriction" ); + m_spinRestriction = new TQSpinBox( m_groupMisc, "m_spinRestriction" ); m_spinRestriction->setMinValue( 0 ); m_spinRestriction->setMaxValue( 3 ); @@ -419,7 +419,7 @@ void K3bVcdBurnDialog::setupAdvancedTab() groupMiscLayout->setRowStretch( 2, 0 ); // ---------------------------------------------------------------------- - QGridLayout* grid = new QGridLayout( w ); + TQGridLayout* grid = new TQGridLayout( w ); grid->setMargin( marginHint() ); grid->setSpacing( spacingHint() ); grid->addWidget( m_groupGeneric, 0, 0 ); @@ -431,42 +431,42 @@ void K3bVcdBurnDialog::setupAdvancedTab() void K3bVcdBurnDialog::setupVideoCdTab() { - QWidget * w = new QWidget( this ); + TQWidget * w = new TQWidget( this ); // ---------------------------------------------------- Format group ---- - m_groupVcdFormat = new QButtonGroup( 4, Qt::Vertical, i18n( "Type" ), w ); - m_radioVcd11 = new QRadioButton( i18n( "VideoCD 1.1" ), m_groupVcdFormat ); - m_radioVcd20 = new QRadioButton( i18n( "VideoCD 2.0" ), m_groupVcdFormat ); - m_radioSvcd10 = new QRadioButton( i18n( "Super-VideoCD" ), m_groupVcdFormat ); - m_radioHqVcd10 = new QRadioButton( i18n( "HQ-VideoCD" ), m_groupVcdFormat ); + m_groupVcdFormat = new TQButtonGroup( 4, Qt::Vertical, i18n( "Type" ), w ); + m_radioVcd11 = new TQRadioButton( i18n( "VideoCD 1.1" ), m_groupVcdFormat ); + m_radioVcd20 = new TQRadioButton( i18n( "VideoCD 2.0" ), m_groupVcdFormat ); + m_radioSvcd10 = new TQRadioButton( i18n( "Super-VideoCD" ), m_groupVcdFormat ); + m_radioHqVcd10 = new TQRadioButton( i18n( "HQ-VideoCD" ), m_groupVcdFormat ); m_groupVcdFormat->setExclusive( true ); // ---------------------------------------------------- Options group --- - m_groupOptions = new QGroupBox( 5, Qt::Vertical, i18n( "Settings" ), w ); - m_checkAutoDetect = new QCheckBox( i18n( "Autodetect VideoCD type" ), m_groupOptions ); + m_groupOptions = new TQGroupBox( 5, Qt::Vertical, i18n( "Settings" ), w ); + m_checkAutoDetect = new TQCheckBox( i18n( "Autodetect VideoCD type" ), m_groupOptions ); - m_checkNonCompliant = new QCheckBox( i18n( "Enable broken SVCD mode" ), m_groupOptions ); + m_checkNonCompliant = new TQCheckBox( i18n( "Enable broken SVCD mode" ), m_groupOptions ); // Only available on SVCD Type m_checkNonCompliant->setEnabled( false ); m_checkNonCompliant->setChecked( false ); - m_checkVCD30interpretation = new QCheckBox( i18n( "Enable %1 track interpretation" ).arg( "VCD 3.0" ), m_groupOptions ); + m_checkVCD30interpretation = new TQCheckBox( i18n( "Enable %1 track interpretation" ).tqarg( "VCD 3.0" ), m_groupOptions ); // Only available on SVCD Type m_checkVCD30interpretation->setEnabled( false ); m_checkVCD30interpretation->setChecked( false ); - m_check2336 = new QCheckBox( i18n( "Use 2336 byte sectors" ), m_groupOptions ); + m_check2336 = new TQCheckBox( i18n( "Use 2336 byte sectors" ), m_groupOptions ); - m_checkCdiSupport = new QCheckBox( i18n( "Enable CD-i support" ), m_groupOptions ); + m_checkCdiSupport = new TQCheckBox( i18n( "Enable CD-i support" ), m_groupOptions ); // ------------------------------------------------- CD-i Application --- - m_groupCdi = new QGroupBox( 4, Qt::Vertical, i18n( "VideoCD on CD-i" ), w ); - m_editCdiCfg = new QMultiLineEdit( m_groupCdi, "m_editCdiCfg" ); - m_editCdiCfg->setFrameShape( QTextEdit::NoFrame ); + m_groupCdi = new TQGroupBox( 4, Qt::Vertical, i18n( "VideoCD on CD-i" ), w ); + m_editCdiCfg = new TQMultiLineEdit( m_groupCdi, "m_editCdiCfg" ); + m_editCdiCfg->setFrameShape( TQTextEdit::NoFrame ); // ---------------------------------------------------------------------- - QGridLayout* grid = new QGridLayout( w ); + TQGridLayout* grid = new TQGridLayout( w ); grid->setMargin( marginHint() ); grid->setSpacing( spacingHint() ); grid->addMultiCellWidget( m_groupVcdFormat, 0, 1, 0, 0 ); @@ -478,60 +478,60 @@ void K3bVcdBurnDialog::setupVideoCdTab() void K3bVcdBurnDialog::setupLabelTab() { - QWidget * w = new QWidget( this ); + TQWidget * w = new TQWidget( this ); // ---------------------------------------------------------------------- // noEdit - QLabel* labelSystemId = new QLabel( i18n( "System:" ), w, "labelSystemId" ); - QLabel* labelApplicationId = new QLabel( i18n( "Application:" ), w, "labelApplicationId" ); - QLabel* labelInfoSystemId = new QLabel( vcdDoc() ->vcdOptions() ->systemId(), w, "labelInfoSystemId" ); - QLabel* labelInfoApplicationId = new QLabel( vcdDoc() ->vcdOptions() ->applicationId(), w, "labelInfoApplicationId" ); + TQLabel* labelSystemId = new TQLabel( i18n( "System:" ), w, "labelSystemId" ); + TQLabel* labelApplicationId = new TQLabel( i18n( "Application:" ), w, "labelApplicationId" ); + TQLabel* labelInfoSystemId = new TQLabel( vcdDoc() ->vcdOptions() ->systemId(), w, "labelInfoSystemId" ); + TQLabel* labelInfoApplicationId = new TQLabel( vcdDoc() ->vcdOptions() ->applicationId(), w, "labelInfoApplicationId" ); - labelInfoSystemId->setFrameShape( QLabel::LineEditPanel ); - labelInfoSystemId->setFrameShadow( QLabel::Sunken ); + labelInfoSystemId->setFrameShape( TQLabel::LineEditPanel ); + labelInfoSystemId->setFrameShadow( TQLabel::Sunken ); - labelInfoApplicationId->setFrameShape( QLabel::LineEditPanel ); - labelInfoApplicationId->setFrameShadow( QLabel::Sunken ); - QToolTip::add + labelInfoApplicationId->setFrameShape( TQLabel::LineEditPanel ); + labelInfoApplicationId->setFrameShadow( TQLabel::Sunken ); + TQToolTip::add ( labelInfoApplicationId, i18n( "ISO application id for VideoCD" ) ); // ---------------------------------------------------------------------- - QLabel* labelVolumeId = new QLabel( i18n( "&Volume name:" ), w, "labelVolumeId" ); - QLabel* labelAlbumId = new QLabel( i18n( "Volume &set name:" ), w, "labelAlbumId" ); - QLabel* labelVolumeCount = new QLabel( i18n( "Volume set s&ize:" ), w, "labelVolumeCount" ); - QLabel* labelVolumeNumber = new QLabel( i18n( "Volume set &number:" ), w, "labelVolumeNumber" ); - QLabel* labelPublisher = new QLabel( i18n( "&Publisher:" ), w, "labelPublisher" ); + TQLabel* labelVolumeId = new TQLabel( i18n( "&Volume name:" ), w, "labelVolumeId" ); + TQLabel* labelAlbumId = new TQLabel( i18n( "Volume &set name:" ), w, "labelAlbumId" ); + TQLabel* labelVolumeCount = new TQLabel( i18n( "Volume set s&ize:" ), w, "labelVolumeCount" ); + TQLabel* labelVolumeNumber = new TQLabel( i18n( "Volume set &number:" ), w, "labelVolumeNumber" ); + TQLabel* labelPublisher = new TQLabel( i18n( "&Publisher:" ), w, "labelPublisher" ); - m_editVolumeId = new QLineEdit( w, "m_editVolumeId" ); - m_editAlbumId = new QLineEdit( w, "m_editAlbumId" ); - m_spinVolumeNumber = new QSpinBox( w, "m_editVolumeNumber" ); - m_spinVolumeCount = new QSpinBox( w, "m_editVolumeCount" ); - m_editPublisher = new QLineEdit( w, "m_editPublisher" ); + m_editVolumeId = new TQLineEdit( w, "m_editVolumeId" ); + m_editAlbumId = new TQLineEdit( w, "m_editAlbumId" ); + m_spinVolumeNumber = new TQSpinBox( w, "m_editVolumeNumber" ); + m_spinVolumeCount = new TQSpinBox( w, "m_editVolumeCount" ); + m_editPublisher = new TQLineEdit( w, "m_editPublisher" ); // only ISO646 d-Characters - m_editVolumeId->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_d, true, m_editVolumeId ) ); - m_editAlbumId->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_d, true, m_editVolumeId ) ); + m_editVolumeId->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_d, true, TQT_TQOBJECT(m_editVolumeId) ) ); + m_editAlbumId->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_d, true, TQT_TQOBJECT(m_editVolumeId) ) ); m_editVolumeId->setMaxLength( 32 ); m_editAlbumId->setMaxLength( 16 ); // only ISO646 a-Characters - m_editPublisher->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_a, true, m_editVolumeId ) ); + m_editPublisher->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_a, true, TQT_TQOBJECT(m_editVolumeId) ) ); m_editPublisher->setMaxLength( 128 ); m_spinVolumeNumber->setMinValue( 1 ); m_spinVolumeNumber->setMaxValue( 1 ); m_spinVolumeCount->setMinValue( 1 ); - QFrame* line = new QFrame( w ); - line->setFrameShape( QFrame::HLine ); - line->setFrameShadow( QFrame::Sunken ); - line->setFrameShape( QFrame::HLine ); + TQFrame* line = new TQFrame( w ); + line->setFrameShape( TQFrame::HLine ); + line->setFrameShadow( TQFrame::Sunken ); + line->setFrameShape( TQFrame::HLine ); // ---------------------------------------------------------------------- - QGridLayout* grid = new QGridLayout( w ); + TQGridLayout* grid = new TQGridLayout( w ); grid->setMargin( marginHint() ); grid->setSpacing( spacingHint() ); @@ -579,8 +579,8 @@ void K3bVcdBurnDialog::setupLabelTab() void K3bVcdBurnDialog::slotStartClicked() { - if ( QFile::exists( vcdDoc() ->vcdImage() ) ) { - if ( KMessageBox::warningContinueCancel( this, i18n( "Do you want to overwrite %1" ).arg( vcdDoc() ->vcdImage() ), i18n( "File Exists" ), i18n("Overwrite") ) + if ( TQFile::exists( vcdDoc() ->vcdImage() ) ) { + if ( KMessageBox::warningContinueCancel( this, i18n( "Do you want to overwrite %1" ).tqarg( vcdDoc() ->vcdImage() ), i18n( "File Exists" ), i18n("Overwrite") ) != KMessageBox::Continue ) return ; } @@ -619,7 +619,7 @@ void K3bVcdBurnDialog::loadK3bDefaults() m_checkCdiSupport->setEnabled( false ); m_checkCdiSupport->setChecked( false ); m_checkUpdateScanOffsets->setEnabled( true ); - m_editVolumeId->setText( "HQ_VIDEOCD" ); + m_editVolumeId->setText( "HTQ_VIDEOCD" ); } else { m_checkCdiSupport->setEnabled( true ); m_checkCdiSupport->setChecked( o.CdiSupport() ); @@ -720,7 +720,7 @@ void K3bVcdBurnDialog::readSettings() m_checkNonCompliant->setEnabled( true ); m_checkVCD30interpretation->setEnabled( true ); break; - case K3bVcdDoc::HQVCD: + case K3bVcdDoc::HTQVCD: m_radioHqVcd10->setChecked( true ); break; default: @@ -882,20 +882,20 @@ void K3bVcdBurnDialog::saveUserDefaults( KConfigBase* c ) void K3bVcdBurnDialog::saveCdiConfig() { - QString filename = locateLocal( "appdata", "cdi/cdi_vcd.cfg" ); - if ( QFile::exists( filename ) ) - QFile::remove + TQString filename = locateLocal( "appdata", "cdi/cdi_vcd.cfg" ); + if ( TQFile::exists( filename ) ) + TQFile::remove ( filename ); - QFile cdi( filename ); + TQFile cdi( filename ); if ( !cdi.open( IO_WriteOnly ) ) return ; - QTextStream s( &cdi ); + TQTextStream s( &cdi ); int i = m_editCdiCfg->numLines(); for ( int j = 0; j < i; j++ ) - s << QString( "%1" ).arg( m_editCdiCfg->textLine( j ) ) << "\n"; + s << TQString( "%1" ).tqarg( m_editCdiCfg->textLine( j ) ) << "\n"; cdi.close(); @@ -904,15 +904,15 @@ void K3bVcdBurnDialog::saveCdiConfig() void K3bVcdBurnDialog::loadCdiConfig() { - QString filename = locateLocal( "appdata", "cdi/cdi_vcd.cfg" ); - if ( QFile::exists( filename ) ) { - QFile cdi( filename ); + TQString filename = locateLocal( "appdata", "cdi/cdi_vcd.cfg" ); + if ( TQFile::exists( filename ) ) { + TQFile cdi( filename ); if ( !cdi.open( IO_ReadOnly ) ) { loadDefaultCdiConfig(); return ; } - QTextStream s( &cdi ); + TQTextStream s( &cdi ); m_editCdiCfg->clear(); @@ -930,16 +930,16 @@ void K3bVcdBurnDialog::loadCdiConfig() void K3bVcdBurnDialog::loadDefaultCdiConfig() { - QString filename = locate( "data", "k3b/cdi/cdi_vcd.cfg" ); - if ( QFile::exists( filename ) ) { - QFile cdi( filename ); + TQString filename = locate( "data", "k3b/cdi/cdi_vcd.cfg" ); + if ( TQFile::exists( filename ) ) { + TQFile cdi( filename ); if ( !cdi.open( IO_ReadOnly ) ) { m_checkCdiSupport->setChecked( false ); m_checkCdiSupport->setEnabled( false ); return ; } - QTextStream s( &cdi ); + TQTextStream s( &cdi ); m_editCdiCfg->clear(); @@ -959,7 +959,7 @@ void K3bVcdBurnDialog::setVolumeID() if ( m_radioSvcd10->isChecked() ) m_editVolumeId->setText( "SUPER_VIDEOCD" ); else if ( m_radioHqVcd10->isChecked() ) - m_editVolumeId->setText( "HQ_VIDEOCD" ); + m_editVolumeId->setText( "HTQ_VIDEOCD" ); else m_editVolumeId->setText( "VIDEOCD" ); } diff --git a/src/projects/k3bvcdburndialog.h b/src/projects/k3bvcdburndialog.h index 6f199a9..322fedf 100644 --- a/src/projects/k3bvcdburndialog.h +++ b/src/projects/k3bvcdburndialog.h @@ -17,17 +17,17 @@ #define K3BVCDBURNDIALOG_H #include "k3bprojectburndialog.h" -#include <qmultilineedit.h> - -class QCheckBox; -class QGroupBox; -class QButtonGroup; -class QSpinBox; -class QRadioButton; -class QLabel; -class QLineEdit; -class QMultiLineEdit; -class QToolButton; +#include <tqmultilineedit.h> + +class TQCheckBox; +class TQGroupBox; +class TQButtonGroup; +class TQSpinBox; +class TQRadioButton; +class TQLabel; +class TQLineEdit; +class TQMultiLineEdit; +class TQToolButton; class K3bWriterSelectionWidget; class K3bTempDirSelectionWidget; class K3bVcdDoc; @@ -36,9 +36,10 @@ class K3bVcdOptions; class K3bVcdBurnDialog : public K3bProjectBurnDialog { Q_OBJECT + TQ_OBJECT public: - K3bVcdBurnDialog( K3bVcdDoc* doc, QWidget *parent = 0, const char *name = 0, bool modal = true ); + K3bVcdBurnDialog( K3bVcdDoc* doc, TQWidget *tqparent = 0, const char *name = 0, bool modal = true ); ~K3bVcdBurnDialog(); K3bVcdDoc* vcdDoc() const @@ -61,62 +62,62 @@ class K3bVcdBurnDialog : public K3bProjectBurnDialog // the video-cd-tab // ----------------------------------------------------------- - QButtonGroup* m_groupVcdFormat; - QRadioButton* m_radioVcd11; - QRadioButton* m_radioVcd20; - QRadioButton* m_radioSvcd10; - QRadioButton* m_radioHqVcd10; + TQButtonGroup* m_groupVcdFormat; + TQRadioButton* m_radioVcd11; + TQRadioButton* m_radioVcd20; + TQRadioButton* m_radioSvcd10; + TQRadioButton* m_radioHqVcd10; - QGroupBox* m_groupOptions; - QCheckBox* m_checkAutoDetect; - QCheckBox* m_checkNonCompliant; - QCheckBox* m_checkVCD30interpretation; - QCheckBox* m_check2336; + TQGroupBox* m_groupOptions; + TQCheckBox* m_checkAutoDetect; + TQCheckBox* m_checkNonCompliant; + TQCheckBox* m_checkVCD30interpretation; + TQCheckBox* m_check2336; // CD-i - QGroupBox* m_groupCdi; - QCheckBox* m_checkCdiSupport; - QMultiLineEdit* m_editCdiCfg; + TQGroupBox* m_groupCdi; + TQCheckBox* m_checkCdiSupport; + TQMultiLineEdit* m_editCdiCfg; // ----------------------------------------------------------- // the video-label-tab // ----------------------------------------------------------- - QLineEdit* m_editVolumeId; - QLineEdit* m_editPublisher; - QLineEdit* m_editAlbumId; + TQLineEdit* m_editVolumeId; + TQLineEdit* m_editPublisher; + TQLineEdit* m_editAlbumId; - QSpinBox* m_spinVolumeCount; - QSpinBox* m_spinVolumeNumber; + TQSpinBox* m_spinVolumeCount; + TQSpinBox* m_spinVolumeNumber; // ----------------------------------------------------------- // the advanced-tab // ----------------------------------------------------------- - QGroupBox* m_groupGeneric; - QGroupBox* m_groupGaps; - QGroupBox* m_groupMisc; - - QCheckBox* m_checkPbc; - QCheckBox* m_checkSegmentFolder; - QCheckBox* m_checkRelaxedAps; - QCheckBox* m_checkUpdateScanOffsets; - QCheckBox* m_checkGaps; - - QSpinBox* m_spinRestriction; - QSpinBox* m_spinPreGapLeadout; - QSpinBox* m_spinPreGapTrack; - QSpinBox* m_spinFrontMarginTrack; - QSpinBox* m_spinRearMarginTrack; - QSpinBox* m_spinFrontMarginTrackSVCD; - QSpinBox* m_spinRearMarginTrackSVCD; - - QLabel* m_labelRestriction; - QLabel* m_labelPreGapLeadout; - QLabel* m_labelPreGapTrack; - QLabel* m_labelFrontMarginTrack; - QLabel* m_labelRearMarginTrack; + TQGroupBox* m_groupGeneric; + TQGroupBox* m_groupGaps; + TQGroupBox* m_groupMisc; + + TQCheckBox* m_checkPbc; + TQCheckBox* m_checkSegmentFolder; + TQCheckBox* m_checkRelaxedAps; + TQCheckBox* m_checkUpdateScanOffsets; + TQCheckBox* m_checkGaps; + + TQSpinBox* m_spinRestriction; + TQSpinBox* m_spinPreGapLeadout; + TQSpinBox* m_spinPreGapTrack; + TQSpinBox* m_spinFrontMarginTrack; + TQSpinBox* m_spinRearMarginTrack; + TQSpinBox* m_spinFrontMarginTrackSVCD; + TQSpinBox* m_spinRearMarginTrackSVCD; + + TQLabel* m_labelRestriction; + TQLabel* m_labelPreGapLeadout; + TQLabel* m_labelPreGapTrack; + TQLabel* m_labelFrontMarginTrack; + TQLabel* m_labelRearMarginTrack; // ----------------------------------------------------------- diff --git a/src/projects/k3bvcdlistview.cpp b/src/projects/k3bvcdlistview.cpp index f61863b..ad3c07c 100644 --- a/src/projects/k3bvcdlistview.cpp +++ b/src/projects/k3bvcdlistview.cpp @@ -13,15 +13,15 @@ * See the file "COPYING" for the exact licensing terms. */ -#include <qheader.h> -#include <qtimer.h> -#include <qdragobject.h> -#include <qpoint.h> -#include <qptrlist.h> -#include <qstringlist.h> -#include <qevent.h> -#include <qpainter.h> -#include <qfontmetrics.h> +#include <tqheader.h> +#include <tqtimer.h> +#include <tqdragobject.h> +#include <tqpoint.h> +#include <tqptrlist.h> +#include <tqstringlist.h> +#include <tqevent.h> +#include <tqpainter.h> +#include <tqfontmetrics.h> #include <kiconloader.h> #include <kurl.h> @@ -39,8 +39,8 @@ #include "k3bvcddoc.h" #include <k3bview.h> -K3bVcdListView::K3bVcdListView( K3bView* view, K3bVcdDoc* doc, QWidget *parent, const char *name ) - : K3bListView( parent, name ), m_doc( doc ), m_view( view ) +K3bVcdListView::K3bVcdListView( K3bView* view, K3bVcdDoc* doc, TQWidget *tqparent, const char *name ) + : K3bListView( tqparent, name ), m_doc( doc ), m_view( view ) { setAcceptDrops( true ); setDropVisualizer( true ); @@ -60,15 +60,15 @@ K3bVcdListView::K3bVcdListView( K3bView* view, K3bVcdDoc* doc, QWidget *parent, setupColumns(); header() ->setClickEnabled( false ); - connect( this, SIGNAL( dropped( KListView*, QDropEvent*, QListViewItem* ) ), - this, SLOT( slotDropped( KListView*, QDropEvent*, QListViewItem* ) ) ); - connect( this, SIGNAL( contextMenu( KListView*, QListViewItem*, const QPoint& ) ), - this, SLOT( showPopupMenu( KListView*, QListViewItem*, const QPoint& ) ) ); - connect( this, SIGNAL( doubleClicked( QListViewItem*, const QPoint&, int ) ), - this, SLOT( showPropertiesDialog() ) ); + connect( this, TQT_SIGNAL( dropped( KListView*, TQDropEvent*, TQListViewItem* ) ), + this, TQT_SLOT( slotDropped( KListView*, TQDropEvent*, TQListViewItem* ) ) ); + connect( this, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), + this, TQT_SLOT( showPopupMenu( KListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), + this, TQT_SLOT( showPropertiesDialog() ) ); - connect( m_doc, SIGNAL( changed() ), this, SLOT( slotUpdateItems() ) ); - connect( m_doc, SIGNAL( trackRemoved( K3bVcdTrack* ) ), this, SLOT( slotTrackRemoved( K3bVcdTrack* ) ) ); + connect( m_doc, TQT_SIGNAL( changed() ), TQT_TQOBJECT(this), TQT_SLOT( slotUpdateItems() ) ); + connect( m_doc, TQT_SIGNAL( trackRemoved( K3bVcdTrack* ) ), TQT_TQOBJECT(this), TQT_SLOT( slotTrackRemoved( K3bVcdTrack* ) ) ); slotUpdateItems(); } @@ -94,8 +94,8 @@ void K3bVcdListView::setupColumns() void K3bVcdListView::setupActions() { m_actionCollection = new KActionCollection( this ); - m_actionProperties = new KAction( i18n( "Properties" ), "misc", 0, this, SLOT( showPropertiesDialog() ), actionCollection() ); - m_actionRemove = new KAction( i18n( "Remove" ), "editdelete", Key_Delete, this, SLOT( slotRemoveTracks() ), actionCollection() ); + m_actionProperties = new KAction( i18n( "Properties" ), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT( showPropertiesDialog() ), actionCollection() ); + m_actionRemove = new KAction( i18n( "Remove" ), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveTracks() ), actionCollection() ); // disabled by default m_actionRemove->setEnabled( false ); @@ -113,21 +113,21 @@ void K3bVcdListView::setupPopupMenu() } -bool K3bVcdListView::acceptDrag( QDropEvent* e ) const +bool K3bVcdListView::acceptDrag( TQDropEvent* e ) const { // the first is for built-in item moving, the second for dropping urls return ( KListView::acceptDrag( e ) || KURLDrag::canDecode( e ) ); } -QDragObject* K3bVcdListView::dragObject() +TQDragObject* K3bVcdListView::dragObject() { - QPtrList<QListViewItem> list = selectedItems(); + TQPtrList<TQListViewItem> list = selectedItems(); if ( list.isEmpty() ) return 0; - QPtrListIterator<QListViewItem> it( list ); + TQPtrListIterator<TQListViewItem> it( list ); KURL::List urls; for ( ; it.current(); ++it ) @@ -137,7 +137,7 @@ QDragObject* K3bVcdListView::dragObject() } -void K3bVcdListView::slotDropped( KListView*, QDropEvent* e, QListViewItem* after ) +void K3bVcdListView::slotDropped( KListView*, TQDropEvent* e, TQListViewItem* after ) { if ( !e->isAccepted() ) return ; @@ -149,8 +149,8 @@ void K3bVcdListView::slotDropped( KListView*, QDropEvent* e, QListViewItem* afte pos = ( ( K3bVcdListViewItem* ) after ) ->vcdTrack() ->index() + 1; if ( e->source() == viewport() ) { - QPtrList<QListViewItem> sel = selectedItems(); - QPtrListIterator<QListViewItem> it( sel ); + TQPtrList<TQListViewItem> sel = selectedItems(); + TQPtrListIterator<TQListViewItem> it( sel ); K3bVcdTrack* trackAfter = ( after ? ( ( K3bVcdListViewItem* ) after ) ->vcdTrack() : 0 ); while ( it.current() ) { K3bVcdTrack * track = ( ( K3bVcdListViewItem* ) it.current() ) ->vcdTrack(); @@ -170,7 +170,7 @@ void K3bVcdListView::slotDropped( KListView*, QDropEvent* e, QListViewItem* afte } -void K3bVcdListView::insertItem( QListViewItem* item ) +void K3bVcdListView::insertItem( TQListViewItem* item ) { KListView::insertItem( item ); @@ -180,7 +180,7 @@ void K3bVcdListView::insertItem( QListViewItem* item ) } } -void K3bVcdListView::showPopupMenu( KListView*, QListViewItem* _item, const QPoint& _point ) +void K3bVcdListView::showPopupMenu( KListView*, TQListViewItem* _item, const TQPoint& _point ) { if ( _item ) { m_actionRemove->setEnabled( true ); @@ -193,23 +193,23 @@ void K3bVcdListView::showPopupMenu( KListView*, QListViewItem* _item, const QPoi void K3bVcdListView::showPropertiesDialog() { - QPtrList<K3bVcdTrack> selected = selectedTracks(); + TQPtrList<K3bVcdTrack> selected = selectedTracks(); if ( !selected.isEmpty() && selected.count() == 1 ) { - QPtrList<K3bVcdTrack> tracks = *m_doc->tracks(); + TQPtrList<K3bVcdTrack> tracks = *m_doc->tracks(); K3bVcdTrackDialog d( m_doc, tracks, selected, this ); if ( d.exec() ) { - repaint(); + tqrepaint(); } } else { m_view->slotProperties(); } } -QPtrList<K3bVcdTrack> K3bVcdListView::selectedTracks() +TQPtrList<K3bVcdTrack> K3bVcdListView::selectedTracks() { - QPtrList<K3bVcdTrack> selectedTracks; - QPtrList<QListViewItem> selectedVI( selectedItems() ); - for ( QListViewItem * item = selectedVI.first(); item != 0; item = selectedVI.next() ) { + TQPtrList<K3bVcdTrack> selectedTracks; + TQPtrList<TQListViewItem> selectedVI( selectedItems() ); + for ( TQListViewItem * item = selectedVI.first(); item != 0; item = selectedVI.next() ) { K3bVcdListViewItem * vcdItem = dynamic_cast<K3bVcdListViewItem*>( item ); if ( vcdItem ) { selectedTracks.append( vcdItem->vcdTrack() ); @@ -222,7 +222,7 @@ QPtrList<K3bVcdTrack> K3bVcdListView::selectedTracks() void K3bVcdListView::slotRemoveTracks() { - QPtrList<K3bVcdTrack> selected = selectedTracks(); + TQPtrList<K3bVcdTrack> selected = selectedTracks(); if ( !selected.isEmpty() ) { for ( K3bVcdTrack * track = selected.first(); track != 0; track = selected.next() ) { @@ -238,7 +238,7 @@ void K3bVcdListView::slotRemoveTracks() void K3bVcdListView::slotTrackRemoved( K3bVcdTrack* track ) { - QListViewItem * viewItem = m_itemMap[ track ]; + TQListViewItem * viewItem = m_itemMap[ track ]; m_itemMap.remove( track ); delete viewItem; } @@ -250,7 +250,7 @@ void K3bVcdListView::slotUpdateItems() K3bVcdTrack * track = m_doc->first(); K3bVcdTrack* lastTrack = 0; while ( track != 0 ) { - if ( !m_itemMap.contains( track ) ) + if ( !m_itemMap.tqcontains( track ) ) m_itemMap.insert( track, new K3bVcdListViewItem( track, this, m_itemMap[ lastTrack ] ) ); lastTrack = track; diff --git a/src/projects/k3bvcdlistview.h b/src/projects/k3bvcdlistview.h index 71d22d7..01fa218 100644 --- a/src/projects/k3bvcdlistview.h +++ b/src/projects/k3bvcdlistview.h @@ -19,12 +19,12 @@ #include <k3blistview.h> -#include <qmap.h> +#include <tqmap.h> -class QDragEnterEvent; -class QDragObject; -class QDropEvent; -class QTimer; +class TQDragEnterEvent; +class TQDragObject; +class TQDropEvent; +class TQTimer; class KPopupMenu; class KAction; class K3bVcdDoc; @@ -32,28 +32,29 @@ class K3bView; class K3bVcdTrack; class KActionCollection; class K3bVcdListViewItem; -class QPainter; +class TQPainter; class K3bVcdListView : public K3bListView { Q_OBJECT + TQ_OBJECT public: - K3bVcdListView( K3bView*, K3bVcdDoc*, QWidget *parent = 0, const char *name = 0 ); + K3bVcdListView( K3bView*, K3bVcdDoc*, TQWidget *tqparent = 0, const char *name = 0 ); ~K3bVcdListView(); /** * reimplemented from KListView */ - void insertItem( QListViewItem* ); + void insertItem( TQListViewItem* ); KActionCollection* actionCollection() const { return m_actionCollection; } - QPtrList<K3bVcdTrack> selectedTracks(); + TQPtrList<K3bVcdTrack> selectedTracks(); signals: void lengthReady(); @@ -72,19 +73,19 @@ class K3bVcdListView : public K3bListView KPopupMenu* m_popupMenu; - QMap<K3bVcdTrack*, K3bVcdListViewItem*> m_itemMap; + TQMap<K3bVcdTrack*, K3bVcdListViewItem*> m_itemMap; private slots: - void slotDropped( KListView*, QDropEvent* e, QListViewItem* after ); + void slotDropped( KListView*, TQDropEvent* e, TQListViewItem* after ); void slotUpdateItems(); - void showPopupMenu( KListView*, QListViewItem* item, const QPoint& ); + void showPopupMenu( KListView*, TQListViewItem* item, const TQPoint& ); void showPropertiesDialog(); void slotRemoveTracks(); void slotTrackRemoved( K3bVcdTrack* ); protected: - bool acceptDrag( QDropEvent* e ) const; - QDragObject* dragObject(); + bool acceptDrag( TQDropEvent* e ) const; + TQDragObject* dragObject(); }; #endif diff --git a/src/projects/k3bvcdlistviewitem.cpp b/src/projects/k3bvcdlistviewitem.cpp index 02df525..5232632 100644 --- a/src/projects/k3bvcdlistviewitem.cpp +++ b/src/projects/k3bvcdlistviewitem.cpp @@ -22,15 +22,15 @@ #include "k3bvcdtrack.h" #include <k3bglobals.h> -K3bVcdListViewItem::K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* parent ) - : K3bListViewItem( parent ), m_track( track ) +K3bVcdListViewItem::K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* tqparent ) + : K3bListViewItem( tqparent ), m_track( track ) { setEditor( 1, LINE ); animate(); } -K3bVcdListViewItem::K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* parent, QListViewItem* after ) - : K3bListViewItem( parent, after ), m_track( track ) +K3bVcdListViewItem::K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* tqparent, TQListViewItem* after ) + : K3bListViewItem( tqparent, after ), m_track( track ) { setEditor( 1, LINE ); animate(); @@ -40,7 +40,7 @@ K3bVcdListViewItem::K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* parent, K3bVcdListViewItem::~K3bVcdListViewItem() {} -QString K3bVcdListViewItem::text( int i ) const +TQString K3bVcdListViewItem::text( int i ) const { // // We add two spaces after all strings (except the once renamable) @@ -49,7 +49,7 @@ QString K3bVcdListViewItem::text( int i ) const switch ( i ) { case 0: - return QString::number( m_track->index() + 1 ).rightJustify( 2, ' ' ) + " "; + return TQString::number( m_track->index() + 1 ).rightJustify( 2, ' ' ) + " "; case 1: return m_track->title(); case 2: @@ -66,7 +66,7 @@ QString K3bVcdListViewItem::text( int i ) const return m_track->video_frate() + " "; case 6: // track mpegmbps - return QString::number( m_track->muxrate() ) + " "; + return TQString::number( m_track->muxrate() ) + " "; case 7: // track mpegduration return m_track->duration() + " "; @@ -82,7 +82,7 @@ QString K3bVcdListViewItem::text( int i ) const } } -void K3bVcdListViewItem::setText( int col, const QString& text ) +void K3bVcdListViewItem::setText( int col, const TQString& text ) { if ( col == 1 ) { // this is the title field @@ -93,9 +93,9 @@ void K3bVcdListViewItem::setText( int col, const QString& text ) } -QString K3bVcdListViewItem::key( int, bool ) const +TQString K3bVcdListViewItem::key( int, bool ) const { - QString num = QString::number( m_track->index() ); + TQString num = TQString::number( m_track->index() ); if ( num.length() == 1 ) return "00" + num; else if ( num.length() == 2 ) diff --git a/src/projects/k3bvcdlistviewitem.h b/src/projects/k3bvcdlistviewitem.h index 0101850..9a1a290 100644 --- a/src/projects/k3bvcdlistviewitem.h +++ b/src/projects/k3bvcdlistviewitem.h @@ -24,18 +24,18 @@ class K3bVcdListViewItem : public K3bListViewItem { public: - K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* parent ); - K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* parent, QListViewItem* after ); + K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* tqparent ); + K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* tqparent, TQListViewItem* after ); ~K3bVcdListViewItem(); - /** reimplemented from QListViewItem */ - QString text( int i ) const; + /** reimplemented from TQListViewItem */ + TQString text( int i ) const; - /** reimplemented from QListViewItem */ - void setText( int col, const QString& text ); + /** reimplemented from TQListViewItem */ + void setText( int col, const TQString& text ); - /** reimplemented from QListViewItem */ - QString key( int column, bool a ) const; + /** reimplemented from TQListViewItem */ + TQString key( int column, bool a ) const; bool animate(); K3bVcdTrack* vcdTrack() diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp index 06588b8..1b148f2 100644 --- a/src/projects/k3bvcdtrackdialog.cpp +++ b/src/projects/k3bvcdtrackdialog.cpp @@ -13,22 +13,22 @@ * See the file "COPYING" for the exact licensing terms. */ -// Qt Includes -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qframe.h> -#include <qgroupbox.h> -#include <qhbox.h> -#include <qlineedit.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qmultilineedit.h> -#include <qpixmap.h> -#include <qradiobutton.h> -#include <qtable.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +// TQt Includes +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqframe.h> +#include <tqgroupbox.h> +#include <tqhbox.h> +#include <tqlineedit.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqmultilineedit.h> +#include <tqpixmap.h> +#include <tqradiobutton.h> +#include <tqtable.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> // Kde Includes #include <kiconloader.h> @@ -47,9 +47,9 @@ #include <k3bcutcombobox.h> -K3bVcdTrackDialog::K3bVcdTrackDialog( K3bVcdDoc* _doc, QPtrList<K3bVcdTrack>& tracks, QPtrList<K3bVcdTrack>& selectedTracks, QWidget* parent, const char* name ) +K3bVcdTrackDialog::K3bVcdTrackDialog( K3bVcdDoc* _doc, TQPtrList<K3bVcdTrack>& tracks, TQPtrList<K3bVcdTrack>& selectedTracks, TQWidget* tqparent, const char* name ) : KDialogBase( KDialogBase::Plain, i18n( "Video Track Properties" ), KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Apply, - KDialogBase::Ok, parent, name ) + KDialogBase::Ok, tqparent, name ) { prepareGui(); @@ -70,7 +70,7 @@ K3bVcdTrackDialog::K3bVcdTrackDialog( K3bVcdDoc* _doc, QPtrList<K3bVcdTrack>& tr m_displayFileName->setText( selectedTrack->fileName() ); m_displayLength->setText( selectedTrack->duration() ); m_displaySize->setText( KIO::convertSize( selectedTrack->size() ) ); - m_muxrate->setText( i18n( "%1 bit/s" ).arg( selectedTrack->muxrate() ) ); + m_muxrate->setText( i18n( "%1 bit/s" ).tqarg( selectedTrack->muxrate() ) ); if ( selectedTrack->isSegment() ) m_labelMimeType->setPixmap( SmallIcon( "image", KIcon::SizeMedium ) ); @@ -93,7 +93,7 @@ void K3bVcdTrackDialog::slotOk() void K3bVcdTrackDialog::setPbcTrack( K3bVcdTrack* selected, K3bCutComboBox* box, int which ) { // TODO: Unset Userdefined on default settings - kdDebug() << QString( "K3bVcdTrackDialog::setPbcTrack: currentItem = %1, count = %2" ).arg( box->currentItem() ).arg( m_tracks.count() ) << endl; + kdDebug() << TQString( "K3bVcdTrackDialog::setPbcTrack: currentItem = %1, count = %2" ).tqarg( box->currentItem() ).tqarg( m_tracks.count() ) << endl; int count = m_tracks.count(); @@ -142,7 +142,7 @@ void K3bVcdTrackDialog::slotApply() selectedTrack->delDefinedNumKey(); if ( m_check_overwritekeys->isChecked() ) { - QListViewItemIterator it( m_list_keys ); + TQListViewItemIterator it( m_list_keys ); int skiped = 0; int startkey = 0; while ( it.current() ) { @@ -158,8 +158,8 @@ void K3bVcdTrackDialog::slotApply() startkey = it.current() ->text( 0 ).toInt(); } - QMap<QString, K3bVcdTrack*>::Iterator mit; - mit = m_numkeysmap.find( it.current() ->text( 1 ) ); + TQMap<TQString, K3bVcdTrack*>::Iterator mit; + mit = m_numkeysmap.tqfind( it.current() ->text( 1 ) ); if ( mit != m_numkeysmap.end() ) if ( mit.data() ) { selectedTrack->setDefinedNumKey( it.current() ->text( 0 ).toInt(), mit.data() ); @@ -198,50 +198,50 @@ void K3bVcdTrackDialog::fillGui() fillPbcGui(); - QToolTip::add + TQToolTip::add ( m_pbc_previous, i18n( "May also look like | << on the remote control. " ) ); - QToolTip::add + TQToolTip::add ( m_pbc_next, i18n( "May also look like >> | on the remote control." ) ); - QToolTip::add + TQToolTip::add ( m_pbc_return, i18n( "This key may be mapped to the STOP key." ) ); - QToolTip::add + TQToolTip::add ( m_pbc_default, i18n( "This key is usually mapped to the > or PLAY key." ) ); - QToolTip::add + TQToolTip::add ( m_comboAfterTimeout, i18n( "Target to be jumped to on time-out of <wait>." ) ); - QToolTip::add + TQToolTip::add ( m_check_reactivity, i18n( "Delay reactivity of keys." ) ); - QToolTip::add + TQToolTip::add ( m_check_pbc, i18n( "Playback control, PBC, is available for Video CD 2.0 and Super Video CD 1.0 disc formats." ) ); - QToolTip::add + TQToolTip::add ( m_check_usekeys, i18n( "Activate the use of numeric keys." ) ); - QToolTip::add + TQToolTip::add ( m_check_overwritekeys, i18n( "Overwrite default numeric keys." ) ); - QToolTip::add + TQToolTip::add ( m_list_keys, i18n( "Numeric keys." ) ); - QToolTip::add + TQToolTip::add ( m_spin_times, i18n( "Times to repeat the playback of 'play track'." ) ); - QToolTip::add + TQToolTip::add ( m_spin_waittime, i18n( "Time in seconds to wait after playback of 'play track'." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_comboAfterTimeout, i18n( "<p>Target to be jumped to on time-out of <wait>." "<p>If omitted (and <wait> is not set to an infinite time) one of the targets is selected at random." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_check_reactivity, i18n( "<p>When reactivity is set to delayed, it is recommended that the length of the referenced 'play track' is not more than 5 seconds." "<p>The recommended setting for a play item consisting of one still picture and no audio is to loop once and have a delayed reactivity." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_check_pbc, i18n( "<p>Playback control, PBC, is available for Video CD 2.0 and Super Video CD 1.0 disc formats." "<p>PBC allows control of the playback of play items and the possibility of interaction with the user through the remote control or some other input device available." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_check_usekeys, i18n( "These are actually pseudo keys, representing the numeric keys 0, 1, ..., 9." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_check_overwritekeys, i18n( "<p>If numeric keys enabled, you can overwrite the default settings." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_spin_times, i18n( "<p>Times to repeat the playback of 'play track'." "<p>The reactivity attribute controls whether the playback of 'play track' is finished, thus delayed, before executing user triggered action or an immediate jump is performed." "<p>After the specified number of repetitions have completed, the <wait> time begins to count down, unless set to an infinite wait time." "<p>If this element is omitted, a default of `1' is used, i.e. the 'play track' will be displayed once." ) ); - QWhatsThis::add + TQWhatsThis::add ( m_spin_waittime, i18n( "Time in seconds to wait after playback of 'play track' before triggering the <timeout> action (unless the user triggers some action before time ran up)." ) ); } @@ -263,13 +263,13 @@ void K3bVcdTrackDialog::fillPbcGui() m_numkeysmap.insert( displayName( selectedTrack ) , selectedTrack ); for ( track = m_tracks.first(); track; track = m_tracks.next() ) { - QPixmap pm; + TQPixmap pm; if ( track->isSegment() ) pm = SmallIcon( "image" ); else pm = SmallIcon( "video" ); - QString s = displayName( track ); + TQString s = displayName( track ); if ( track != selectedTrack ) // donot insert selectedTrack, it was as "ItSelf" inserted to the begin of map m_numkeysmap.insert( s, track ); @@ -296,8 +296,8 @@ void K3bVcdTrackDialog::fillPbcGui() } // add Event Disabled - QPixmap pmDisabled = SmallIcon( "stop" ); - QString txtDisabled = i18n( "Event Disabled" ); + TQPixmap pmDisabled = SmallIcon( "stop" ); + TQString txtDisabled = i18n( "Event Disabled" ); m_pbc_previous->insertItem( pmDisabled, txtDisabled ); m_pbc_next->insertItem( pmDisabled, txtDisabled ); m_pbc_return->insertItem( pmDisabled, txtDisabled ); @@ -305,8 +305,8 @@ void K3bVcdTrackDialog::fillPbcGui() m_comboAfterTimeout->insertItem( pmDisabled, txtDisabled ); // add VideoCD End - QPixmap pmEnd = SmallIcon( "cdrom_unmount" ); - QString txtEnd = i18n( "VideoCD END" ); + TQPixmap pmEnd = SmallIcon( "cdrom_unmount" ); + TQString txtEnd = i18n( "VideoCD END" ); m_pbc_previous->insertItem( pmEnd, txtEnd ); m_pbc_next->insertItem( pmEnd, txtEnd ); m_pbc_return->insertItem( pmEnd, txtEnd ); @@ -315,7 +315,7 @@ void K3bVcdTrackDialog::fillPbcGui() m_numkeysmap.insert( txtEnd, 0L ); for ( int i = 99; i > 0; i-- ) { - item = new K3bListViewItem( m_list_keys, QString::number( i ) + " ", "" ); + item = new K3bListViewItem( m_list_keys, TQString::number( i ) + " ", "" ); item->setEditor( 1, K3bListViewItem::COMBO , m_numkeysmap.keys() ); } @@ -363,50 +363,50 @@ void K3bVcdTrackDialog::fillPbcGui() void K3bVcdTrackDialog::prepareGui() { - QFrame * frame = plainPage(); + TQFrame * frame = plainPage(); - QGridLayout* mainLayout = new QGridLayout( frame ); + TQGridLayout* mainLayout = new TQGridLayout( frame ); mainLayout->setSpacing( spacingHint() ); mainLayout->setMargin( 0 ); - m_mainTabbed = new QTabWidget( frame ); + m_mainTabbed = new TQTabWidget( frame ); /////////////////////////////////////////////////// // FILE-INFO BOX /////////////////////////////////////////////////// - QGroupBox* groupFileInfo = new QGroupBox( 0, Qt::Vertical, i18n( "File Info" ), frame, "groupFileInfo" ); - groupFileInfo->layout() ->setSpacing( 0 ); - groupFileInfo->layout() ->setMargin( 0 ); + TQGroupBox* groupFileInfo = new TQGroupBox( 0, Qt::Vertical, i18n( "File Info" ), frame, "groupFileInfo" ); + groupFileInfo->tqlayout() ->setSpacing( 0 ); + groupFileInfo->tqlayout() ->setMargin( 0 ); - QGridLayout* groupFileInfoLayout = new QGridLayout( groupFileInfo->layout() ); - groupFileInfoLayout->setAlignment( Qt::AlignTop ); + TQGridLayout* groupFileInfoLayout = new TQGridLayout( groupFileInfo->tqlayout() ); + groupFileInfoLayout->tqsetAlignment( TQt::AlignTop ); groupFileInfoLayout->setSpacing( spacingHint() ); groupFileInfoLayout->setMargin( marginHint() ); - m_labelMimeType = new QLabel( groupFileInfo, "m_labelMimeType" ); + m_labelMimeType = new TQLabel( groupFileInfo, "m_labelMimeType" ); m_displayFileName = new KCutLabel( groupFileInfo ); m_displayFileName->setText( i18n( "Filename" ) ); - m_displayFileName->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) ); + m_displayFileName->tqsetAlignment( int( TQLabel::AlignTop | TQLabel::AlignLeft ) ); - QLabel* labelSize = new QLabel( i18n( "Size:" ), groupFileInfo, "labelSize" ); - QLabel* labelLength = new QLabel( i18n( "Length:" ), groupFileInfo, "labelLength" ); - QLabel* labelMuxrate = new QLabel( i18n( "Muxrate:" ), groupFileInfo, "labelMuxrate" ); + TQLabel* labelSize = new TQLabel( i18n( "Size:" ), groupFileInfo, "labelSize" ); + TQLabel* labelLength = new TQLabel( i18n( "Length:" ), groupFileInfo, "labelLength" ); + TQLabel* labelMuxrate = new TQLabel( i18n( "Muxrate:" ), groupFileInfo, "labelMuxrate" ); - m_displaySize = new QLabel( groupFileInfo, "m_displaySize" ); + m_displaySize = new TQLabel( groupFileInfo, "m_displaySize" ); m_displaySize->setText( "0.0 MB" ); - m_displaySize->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + m_displaySize->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); - m_displayLength = new QLabel( groupFileInfo, "m_displayLength" ); + m_displayLength = new TQLabel( groupFileInfo, "m_displayLength" ); m_displayLength->setText( "0:0:0" ); - m_displayLength->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + m_displayLength->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); - m_muxrate = new QLabel( groupFileInfo, "m_muxrate" ); - m_muxrate->setText( i18n( "%1 bit/s" ).arg( 0 ) ); - m_muxrate->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + m_muxrate = new TQLabel( groupFileInfo, "m_muxrate" ); + m_muxrate->setText( i18n( "%1 bit/s" ).tqarg( 0 ) ); + m_muxrate->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); - QFrame* fileInfoLine = new QFrame( groupFileInfo ); - fileInfoLine->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + TQFrame* fileInfoLine = new TQFrame( groupFileInfo ); + fileInfoLine->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); groupFileInfoLayout->addWidget( m_labelMimeType, 0, 0 ); groupFileInfoLayout->addMultiCellWidget( m_displayFileName, 0, 1, 1, 1 ); @@ -421,7 +421,7 @@ void K3bVcdTrackDialog::prepareGui() groupFileInfoLayout->setRowStretch( 6, 1 ); groupFileInfoLayout->setColStretch( 1, 1 ); - QFont f( m_displayLength->font() ); + TQFont f( m_displayLength->font() ); f.setBold( true ); m_displayLength->setFont( f ); m_displaySize->setFont( f ); @@ -440,54 +440,54 @@ void K3bVcdTrackDialog::setupPbcTab() // ///////////////////////////////////////////////// // Playback Control TAB // ///////////////////////////////////////////////// - QWidget * w = new QWidget( m_mainTabbed ); + TQWidget * w = new TQWidget( m_mainTabbed ); - QGridLayout* grid = new QGridLayout( w ); - grid->setAlignment( Qt::AlignTop ); + TQGridLayout* grid = new TQGridLayout( w ); + grid->tqsetAlignment( TQt::AlignTop ); grid->setSpacing( spacingHint() ); grid->setMargin( marginHint() ); ////////////////////////////////////////////////////////////////////////////////////////// - QGroupBox* groupOptions = new QGroupBox( 3, Qt::Vertical, i18n( "Settings" ), w ); - groupOptions->layout() ->setSpacing( spacingHint() ); - groupOptions->layout() ->setMargin( marginHint() ); + TQGroupBox* groupOptions = new TQGroupBox( 3, Qt::Vertical, i18n( "Settings" ), w ); + groupOptions->tqlayout() ->setSpacing( spacingHint() ); + groupOptions->tqlayout() ->setMargin( marginHint() ); - m_check_pbc = new QCheckBox( i18n( "Enable playback control (for the whole CD)" ), groupOptions, "m_check_pbc" ); + m_check_pbc = new TQCheckBox( i18n( "Enable playback control (for the whole CD)" ), groupOptions, "m_check_pbc" ); - m_check_usekeys = new QCheckBox( i18n( "Use numeric keys" ), groupOptions, "m_check_usekeys" ); + m_check_usekeys = new TQCheckBox( i18n( "Use numeric keys" ), groupOptions, "m_check_usekeys" ); m_check_usekeys->setEnabled( false ); - m_check_reactivity = new QCheckBox( i18n( "Reactivity delayed to the end of playing track" ), groupOptions, "m_check_reactivity" ); + m_check_reactivity = new TQCheckBox( i18n( "Reactivity delayed to the end of playing track" ), groupOptions, "m_check_reactivity" ); m_check_reactivity->setEnabled( false ); ////////////////////////////////////////////////////////////////////////////////////////// - m_groupPlay = new QGroupBox( 0, Qt::Vertical, i18n( "Playing" ), w ); - m_groupPlay->layout() ->setSpacing( spacingHint() ); - m_groupPlay->layout() ->setMargin( marginHint() ); + m_groupPlay = new TQGroupBox( 0, Qt::Vertical, i18n( "Playing" ), w ); + m_groupPlay->tqlayout() ->setSpacing( spacingHint() ); + m_groupPlay->tqlayout() ->setMargin( marginHint() ); - QGridLayout* groupPlayLayout = new QGridLayout( m_groupPlay->layout() ); - groupPlayLayout->setAlignment( Qt::AlignTop ); + TQGridLayout* groupPlayLayout = new TQGridLayout( m_groupPlay->tqlayout() ); + groupPlayLayout->tqsetAlignment( TQt::AlignTop ); - QLabel* labelPlaying = new QLabel( i18n( "Playing track" ) , m_groupPlay, "labelPlaying" ); + TQLabel* labelPlaying = new TQLabel( i18n( "Playing track" ) , m_groupPlay, "labelPlaying" ); - m_spin_times = new QSpinBox( m_groupPlay, "m_spin_times" ); + m_spin_times = new TQSpinBox( m_groupPlay, "m_spin_times" ); m_spin_times->setValue( 1 ); m_spin_times->setSuffix( i18n( " time(s)" ) ); m_spin_times->setSpecialValueText( i18n( "forever" ) ); ////////////////////////////////////////////////////////////////////////////////////////// - m_labelWait = new QLabel( i18n( "then wait" ), m_groupPlay, "m_labelWait" ); - m_spin_waittime = new QSpinBox( m_groupPlay, "m_spinSeconds" ); + m_labelWait = new TQLabel( i18n( "then wait" ), m_groupPlay, "m_labelWait" ); + m_spin_waittime = new TQSpinBox( m_groupPlay, "m_spinSeconds" ); m_spin_waittime->setMinValue( -1 ); m_spin_waittime->setValue( 0 ); // m_spin_waittime->setEnabled( false ); m_spin_waittime->setSuffix( i18n( " seconds" ) ); m_spin_waittime->setSpecialValueText( i18n( "infinite" ) ); - m_labelAfterTimeout = new QLabel( i18n( "after timeout playing" ), m_groupPlay, "m_labelTimeout" ); + m_labelAfterTimeout = new TQLabel( i18n( "after timeout playing" ), m_groupPlay, "m_labelTimeout" ); // m_labelAfterTimeout->setEnabled( false ); - m_comboAfterTimeout = new K3bCutComboBox( K3bCutComboBox::SQUEEZE, m_groupPlay, "m_comboAfterTimeout" ); + m_comboAfterTimeout = new K3bCutComboBox( K3bCutComboBox::STQUEEZE, m_groupPlay, "m_comboAfterTimeout" ); // m_comboAfterTimeout->setEnabled( false ); groupPlayLayout->addWidget( labelPlaying, 1, 0 ); @@ -498,22 +498,22 @@ void K3bVcdTrackDialog::setupPbcTab() groupPlayLayout->addMultiCellWidget( m_comboAfterTimeout, 3, 3, 1, 3 ); ////////////////////////////////////////////////////////////////////////////////////////// - m_groupPbc = new QGroupBox( 0, Qt::Vertical, i18n( "Key Pressed Interaction" ), w ); - m_groupPbc->layout() ->setSpacing( spacingHint() ); - m_groupPbc->layout() ->setMargin( marginHint() ); + m_groupPbc = new TQGroupBox( 0, Qt::Vertical, i18n( "Key Pressed Interaction" ), w ); + m_groupPbc->tqlayout() ->setSpacing( spacingHint() ); + m_groupPbc->tqlayout() ->setMargin( marginHint() ); - QGridLayout* groupPbcLayout = new QGridLayout( m_groupPbc->layout() ); - groupPbcLayout->setAlignment( Qt::AlignTop ); + TQGridLayout* groupPbcLayout = new TQGridLayout( m_groupPbc->tqlayout() ); + groupPbcLayout->tqsetAlignment( TQt::AlignTop ); - QLabel* labelPbc_previous = new QLabel( i18n( "Previous:" ), m_groupPbc, "labelPbc_previous" ); - QLabel* labelPbc_next = new QLabel( i18n( "Next:" ), m_groupPbc, "labelPbc_next" ); - QLabel* labelPbc_return = new QLabel( i18n( "Return:" ), m_groupPbc, "labelPbc_return" ); - QLabel* labelPbc_default = new QLabel( i18n( "Default:" ), m_groupPbc, "labelPbc_default" ); + TQLabel* labelPbc_previous = new TQLabel( i18n( "Previous:" ), m_groupPbc, "labelPbc_previous" ); + TQLabel* labelPbc_next = new TQLabel( i18n( "Next:" ), m_groupPbc, "labelPbc_next" ); + TQLabel* labelPbc_return = new TQLabel( i18n( "Return:" ), m_groupPbc, "labelPbc_return" ); + TQLabel* labelPbc_default = new TQLabel( i18n( "Default:" ), m_groupPbc, "labelPbc_default" ); - m_pbc_previous = new K3bCutComboBox( K3bCutComboBox::SQUEEZE, m_groupPbc, "m_pbc_previous" ); - m_pbc_next = new K3bCutComboBox( K3bCutComboBox::SQUEEZE, m_groupPbc, "m_pbc_next" ); - m_pbc_return = new K3bCutComboBox( K3bCutComboBox::SQUEEZE, m_groupPbc, "m_pbc_return" ); - m_pbc_default = new K3bCutComboBox( K3bCutComboBox::SQUEEZE, m_groupPbc, "m_pbc_default" ); + m_pbc_previous = new K3bCutComboBox( K3bCutComboBox::STQUEEZE, m_groupPbc, "m_pbc_previous" ); + m_pbc_next = new K3bCutComboBox( K3bCutComboBox::STQUEEZE, m_groupPbc, "m_pbc_next" ); + m_pbc_return = new K3bCutComboBox( K3bCutComboBox::STQUEEZE, m_groupPbc, "m_pbc_return" ); + m_pbc_default = new K3bCutComboBox( K3bCutComboBox::STQUEEZE, m_groupPbc, "m_pbc_default" ); groupPbcLayout->addWidget( labelPbc_previous, 1, 0 ); groupPbcLayout->addMultiCellWidget( m_pbc_previous, 1, 1, 1, 3 ); @@ -539,10 +539,10 @@ void K3bVcdTrackDialog::setupPbcTab() m_groupPlay->setEnabled( false ); m_groupPbc->setEnabled( false ); - connect( m_check_pbc, SIGNAL( toggled( bool ) ), this, SLOT( slotPbcToggled( bool ) ) ); - connect( m_spin_times, SIGNAL( valueChanged( int ) ), this, SLOT( slotPlayTimeChanged( int ) ) ); - connect( m_spin_waittime, SIGNAL( valueChanged( int ) ), this, SLOT( slotWaitTimeChanged( int ) ) ); - connect( m_check_usekeys, SIGNAL( toggled( bool ) ), this, SLOT( slotUseKeysToggled( bool ) ) ); + connect( m_check_pbc, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPbcToggled( bool ) ) ); + connect( m_spin_times, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotPlayTimeChanged( int ) ) ); + connect( m_spin_waittime, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotWaitTimeChanged( int ) ) ); + connect( m_check_usekeys, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotUseKeysToggled( bool ) ) ); } void K3bVcdTrackDialog::setupPbcKeyTab() @@ -550,35 +550,35 @@ void K3bVcdTrackDialog::setupPbcKeyTab() // ///////////////////////////////////////////////// // Playback Control Numeric Key's TAB // ///////////////////////////////////////////////// - m_widgetnumkeys = new QWidget( m_mainTabbed ); + m_widgetnumkeys = new TQWidget( m_mainTabbed ); - QGridLayout* grid = new QGridLayout( m_widgetnumkeys ); - grid->setAlignment( Qt::AlignTop ); + TQGridLayout* grid = new TQGridLayout( m_widgetnumkeys ); + grid->tqsetAlignment( TQt::AlignTop ); grid->setSpacing( spacingHint() ); grid->setMargin( marginHint() ); - m_groupKey = new QGroupBox( 3, Qt::Vertical, i18n( "Numeric Keys" ), m_widgetnumkeys ); + m_groupKey = new TQGroupBox( 3, Qt::Vertical, i18n( "Numeric Keys" ), m_widgetnumkeys ); m_groupKey->setEnabled( false ); - m_groupKey->layout() ->setSpacing( spacingHint() ); - m_groupKey->layout() ->setMargin( marginHint() ); + m_groupKey->tqlayout() ->setSpacing( spacingHint() ); + m_groupKey->tqlayout() ->setMargin( marginHint() ); m_list_keys = new K3bListView( m_groupKey, "m_list_keys" ); m_list_keys->setAllColumnsShowFocus( true ); m_list_keys->setDoubleClickForEdit( false ); - m_list_keys->setColumnAlignment( 0, Qt::AlignRight ); - m_list_keys->setSelectionMode( QListView::NoSelection ); + m_list_keys->setColumnAlignment( 0, TQt::AlignRight ); + m_list_keys->setSelectionMode( TQListView::NoSelection ); m_list_keys->setSorting( -1 ); m_list_keys->addColumn( i18n( "Key" ) ); m_list_keys->addColumn( i18n( "Playing" ) ); - m_list_keys->setResizeMode( QListView::LastColumn ); - m_check_overwritekeys = new QCheckBox( i18n( "Overwrite default assignment" ), m_widgetnumkeys, "m_check_overwritekeys" ); + m_list_keys->setResizeMode( TQListView::LastColumn ); + m_check_overwritekeys = new TQCheckBox( i18n( "Overwrite default assignment" ), m_widgetnumkeys, "m_check_overwritekeys" ); grid->addWidget( m_groupKey, 1, 0 ); grid->addWidget( m_check_overwritekeys, 2, 0 ); m_mainTabbed->addTab( m_widgetnumkeys, i18n( "Numeric Keys" ) ); - connect( m_check_overwritekeys, SIGNAL( toggled( bool ) ), this, SLOT( slotGroupkeyToggled( bool ) ) ); + connect( m_check_overwritekeys, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotGroupkeyToggled( bool ) ) ); } @@ -587,36 +587,36 @@ void K3bVcdTrackDialog::setupAudioTab() // ///////////////////////////////////////////////// // AUDIO TAB // ///////////////////////////////////////////////// - QWidget * w = new QWidget( m_mainTabbed ); + TQWidget * w = new TQWidget( m_mainTabbed ); - QGridLayout* grid = new QGridLayout( w ); - grid->setAlignment( Qt::AlignTop ); + TQGridLayout* grid = new TQGridLayout( w ); + grid->tqsetAlignment( TQt::AlignTop ); grid->setSpacing( spacingHint() ); grid->setMargin( marginHint() ); - QLabel* labelMpegVer_Audio = new QLabel( i18n( "Type:" ), w, "labelMpegVer_Audio" ); - QLabel* labelRate_Audio = new QLabel( i18n( "Rate:" ), w, "labelRate_Audio" ); - QLabel* labelSampling_Frequency_Audio = new QLabel( i18n( "Sampling frequency:" ), w, "labelSampling_Frequency_Audio" ); - QLabel* labelMode_Audio = new QLabel( i18n( "Mode:" ), w, "labelMode_Audio" ); - QLabel* labelCopyright_Audio = new QLabel( i18n( "Copyright:" ), w, "labelCopyright_Audio" ); - - m_mpegver_audio = new QLabel( w, "m_mpegver_audio" ); - m_rate_audio = new QLabel( w, "m_rate_audio" ); - m_sampling_frequency_audio = new QLabel( w, "m_sampling_frequency_audio" ); - m_mode_audio = new QLabel( w, "m_mode_audio" ); - m_copyright_audio = new QLabel( w, "m_copyright_audio" ); - - m_mpegver_audio->setFrameShape( QLabel::LineEditPanel ); - m_rate_audio->setFrameShape( QLabel::LineEditPanel ); - m_sampling_frequency_audio->setFrameShape( QLabel::LineEditPanel ); - m_mode_audio->setFrameShape( QLabel::LineEditPanel ); - m_copyright_audio->setFrameShape( QLabel::LineEditPanel ); - - m_mpegver_audio->setFrameShadow( QLabel::Sunken ); - m_rate_audio->setFrameShadow( QLabel::Sunken ); - m_sampling_frequency_audio->setFrameShadow( QLabel::Sunken ); - m_mode_audio->setFrameShadow( QLabel::Sunken ); - m_copyright_audio->setFrameShadow( QLabel::Sunken ); + TQLabel* labelMpegVer_Audio = new TQLabel( i18n( "Type:" ), w, "labelMpegVer_Audio" ); + TQLabel* labelRate_Audio = new TQLabel( i18n( "Rate:" ), w, "labelRate_Audio" ); + TQLabel* labelSampling_Frequency_Audio = new TQLabel( i18n( "Sampling frequency:" ), w, "labelSampling_Frequency_Audio" ); + TQLabel* labelMode_Audio = new TQLabel( i18n( "Mode:" ), w, "labelMode_Audio" ); + TQLabel* labelCopyright_Audio = new TQLabel( i18n( "Copyright:" ), w, "labelCopyright_Audio" ); + + m_mpegver_audio = new TQLabel( w, "m_mpegver_audio" ); + m_rate_audio = new TQLabel( w, "m_rate_audio" ); + m_sampling_frequency_audio = new TQLabel( w, "m_sampling_frequency_audio" ); + m_mode_audio = new TQLabel( w, "m_mode_audio" ); + m_copyright_audio = new TQLabel( w, "m_copyright_audio" ); + + m_mpegver_audio->setFrameShape( TQLabel::LineEditPanel ); + m_rate_audio->setFrameShape( TQLabel::LineEditPanel ); + m_sampling_frequency_audio->setFrameShape( TQLabel::LineEditPanel ); + m_mode_audio->setFrameShape( TQLabel::LineEditPanel ); + m_copyright_audio->setFrameShape( TQLabel::LineEditPanel ); + + m_mpegver_audio->setFrameShadow( TQLabel::Sunken ); + m_rate_audio->setFrameShadow( TQLabel::Sunken ); + m_sampling_frequency_audio->setFrameShadow( TQLabel::Sunken ); + m_mode_audio->setFrameShadow( TQLabel::Sunken ); + m_copyright_audio->setFrameShadow( TQLabel::Sunken ); grid->addWidget( labelMpegVer_Audio, 1, 0 ); grid->addMultiCellWidget( m_mpegver_audio, 1, 1, 1, 4 ); @@ -644,40 +644,40 @@ void K3bVcdTrackDialog::setupVideoTab() // ///////////////////////////////////////////////// // VIDEO TAB // ///////////////////////////////////////////////// - QWidget * w = new QWidget( m_mainTabbed ); + TQWidget * w = new TQWidget( m_mainTabbed ); - QGridLayout* grid = new QGridLayout( w ); - grid->setAlignment( Qt::AlignTop ); + TQGridLayout* grid = new TQGridLayout( w ); + grid->tqsetAlignment( TQt::AlignTop ); grid->setSpacing( spacingHint() ); grid->setMargin( marginHint() ); - QLabel* labelMpegVer_Video = new QLabel( i18n( "Type:" ), w, "labelMpegVer_Video" ); - QLabel* labelRate_Video = new QLabel( i18n( "Rate:" ), w, "labelRate_Video" ); - QLabel* labelChromaFormat_Video = new QLabel( i18n( "Chroma format:" ), w, "labelChromaFormat_Video" ); - QLabel* labelFormat_Video = new QLabel( i18n( "Video format:" ), w, "labelFormat_Video" ); - QLabel* labelResolution_Video = new QLabel( i18n( "Resolution:" ), w, "labelSize_Video" ); - QLabel* labelHighResolution_Video = new QLabel( i18n( "High resolution:" ), w, "labelHighResolution_Video" ); - - m_mpegver_video = new QLabel( w, "m_mpegver_video" ); - m_rate_video = new QLabel( w, "m_rate_video" ); - m_chromaformat_video = new QLabel( w, "m_chromaformat_video" ); - m_format_video = new QLabel( w, "m_format_video" ); - m_resolution_video = new QLabel( w, "m_resolution_video" ); - m_highresolution_video = new QLabel( w, "m_highresolution_video" ); - - m_mpegver_video->setFrameShape( QLabel::LineEditPanel ); - m_rate_video->setFrameShape( QLabel::LineEditPanel ); - m_chromaformat_video->setFrameShape( QLabel::LineEditPanel ); - m_format_video->setFrameShape( QLabel::LineEditPanel ); - m_resolution_video->setFrameShape( QLabel::LineEditPanel ); - m_highresolution_video->setFrameShape( QLabel::LineEditPanel ); - - m_mpegver_video->setFrameShadow( QLabel::Sunken ); - m_rate_video->setFrameShadow( QLabel::Sunken ); - m_chromaformat_video->setFrameShadow( QLabel::Sunken ); - m_format_video->setFrameShadow( QLabel::Sunken ); - m_resolution_video->setFrameShadow( QLabel::Sunken ); - m_highresolution_video->setFrameShadow( QLabel::Sunken ); + TQLabel* labelMpegVer_Video = new TQLabel( i18n( "Type:" ), w, "labelMpegVer_Video" ); + TQLabel* labelRate_Video = new TQLabel( i18n( "Rate:" ), w, "labelRate_Video" ); + TQLabel* labelChromaFormat_Video = new TQLabel( i18n( "Chroma format:" ), w, "labelChromaFormat_Video" ); + TQLabel* labelFormat_Video = new TQLabel( i18n( "Video format:" ), w, "labelFormat_Video" ); + TQLabel* labelResolution_Video = new TQLabel( i18n( "Resolution:" ), w, "labelSize_Video" ); + TQLabel* labelHighResolution_Video = new TQLabel( i18n( "High resolution:" ), w, "labelHighResolution_Video" ); + + m_mpegver_video = new TQLabel( w, "m_mpegver_video" ); + m_rate_video = new TQLabel( w, "m_rate_video" ); + m_chromaformat_video = new TQLabel( w, "m_chromaformat_video" ); + m_format_video = new TQLabel( w, "m_format_video" ); + m_resolution_video = new TQLabel( w, "m_resolution_video" ); + m_highresolution_video = new TQLabel( w, "m_highresolution_video" ); + + m_mpegver_video->setFrameShape( TQLabel::LineEditPanel ); + m_rate_video->setFrameShape( TQLabel::LineEditPanel ); + m_chromaformat_video->setFrameShape( TQLabel::LineEditPanel ); + m_format_video->setFrameShape( TQLabel::LineEditPanel ); + m_resolution_video->setFrameShape( TQLabel::LineEditPanel ); + m_highresolution_video->setFrameShape( TQLabel::LineEditPanel ); + + m_mpegver_video->setFrameShadow( TQLabel::Sunken ); + m_rate_video->setFrameShadow( TQLabel::Sunken ); + m_chromaformat_video->setFrameShadow( TQLabel::Sunken ); + m_format_video->setFrameShadow( TQLabel::Sunken ); + m_resolution_video->setFrameShadow( TQLabel::Sunken ); + m_highresolution_video->setFrameShadow( TQLabel::Sunken ); grid->addWidget( labelMpegVer_Video, 1, 0 ); grid->addMultiCellWidget( m_mpegver_video, 1, 1, 1, 4 ); @@ -712,17 +712,17 @@ void K3bVcdTrackDialog::setDefinedNumKeys( ) } - QListViewItemIterator it( m_list_keys ); - QMap<int, K3bVcdTrack*> definedkeysmap = selectedTrack->DefinedNumKey(); + TQListViewItemIterator it( m_list_keys ); + TQMap<int, K3bVcdTrack*> definedkeysmap = selectedTrack->DefinedNumKey(); while ( it.current() ) { int itemId = it.current() ->text( 0 ).toInt(); - QMap<int, K3bVcdTrack*>::const_iterator keyit = definedkeysmap.find( itemId ); + TQMap<int, K3bVcdTrack*>::const_iterator keyit = definedkeysmap.tqfind( itemId ); if ( keyit != definedkeysmap.end() ) { if ( keyit.data() ) { - if ( m_tracks.findRef( keyit.data() ) >= 0 ) { + if ( m_tracks.tqfindRef( keyit.data() ) >= 0 ) { it.current() ->setText( 1 , displayName( keyit.data() ) ) ; } else { it.current() ->setText( 1 , "" ) ; @@ -738,15 +738,15 @@ void K3bVcdTrackDialog::setDefinedNumKeys( ) } } -QString K3bVcdTrackDialog::displayName( K3bVcdTrack * track ) +TQString K3bVcdTrackDialog::displayName( K3bVcdTrack * track ) { if ( track == m_selectedTracks.first() ) return i18n( "ItSelf" ); if ( track->isSegment() ) - return i18n( "Segment-%1 - %2" ).arg( QString::number( track->index() + 1 ).rightJustify( 3, '0' ) ).arg( track->title() ); + return i18n( "Segment-%1 - %2" ).tqarg( TQString::number( track->index() + 1 ).rightJustify( 3, '0' ) ).tqarg( track->title() ); - return i18n( "Sequence-%1 - %2" ).arg( QString::number( track->index() + 1 ).rightJustify( 3, '0' ) ).arg( track->title() ); + return i18n( "Sequence-%1 - %2" ).tqarg( TQString::number( track->index() + 1 ).rightJustify( 3, '0' ) ).tqarg( track->title() ); } void K3bVcdTrackDialog::slotPlayTimeChanged( int value ) diff --git a/src/projects/k3bvcdtrackdialog.h b/src/projects/k3bvcdtrackdialog.h index 3b62c35..565275b 100644 --- a/src/projects/k3bvcdtrackdialog.h +++ b/src/projects/k3bvcdtrackdialog.h @@ -17,19 +17,19 @@ #define K3BVCDTRACKDIALOG_H #include <kdialogbase.h> -#include <qptrlist.h> -#include <qtabwidget.h> +#include <tqptrlist.h> +#include <tqtabwidget.h> #include <k3bvcddoc.h> #include <k3blistview.h> class K3bVcdTrack; -class QLabel; -class QCheckBox; -class QComboBox; -class QGroupBox; -class QRadioButton; -class QButtonGroup; +class TQLabel; +class TQCheckBox; +class TQComboBox; +class TQGroupBox; +class TQRadioButton; +class TQButtonGroup; class KCutLabel; class K3bCutComboBox; @@ -37,9 +37,10 @@ class K3bCutComboBox; class K3bVcdTrackDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - K3bVcdTrackDialog( K3bVcdDoc*, QPtrList<K3bVcdTrack>& tracks, QPtrList<K3bVcdTrack>& selectedTracks, QWidget* parent = 0, const char* name = 0 ); + K3bVcdTrackDialog( K3bVcdDoc*, TQPtrList<K3bVcdTrack>& tracks, TQPtrList<K3bVcdTrack>& selectedTracks, TQWidget* tqparent = 0, const char* name = 0 ); ~K3bVcdTrackDialog(); protected slots: @@ -56,37 +57,37 @@ class K3bVcdTrackDialog : public KDialogBase private: K3bVcdDoc* m_vcdDoc; - QPtrList<K3bVcdTrack> m_tracks; - QPtrList<K3bVcdTrack> m_selectedTracks; - QMap<QString, K3bVcdTrack*> m_numkeysmap; - QTabWidget* m_mainTabbed; + TQPtrList<K3bVcdTrack> m_tracks; + TQPtrList<K3bVcdTrack> m_selectedTracks; + TQMap<TQString, K3bVcdTrack*> m_numkeysmap; + TQTabWidget* m_mainTabbed; KCutLabel* m_displayFileName; - QLabel* m_labelMimeType; - QLabel* m_displaySize; - QLabel* m_displayLength; - QLabel* m_muxrate; - - QLabel* m_mpegver_audio; - QLabel* m_rate_audio; - QLabel* m_sampling_frequency_audio; - QLabel* m_mode_audio; - QLabel* m_copyright_audio; - - QLabel* m_mpegver_video; - QLabel* m_rate_video; - QLabel* m_chromaformat_video; - QLabel* m_format_video; - QLabel* m_resolution_video; - QLabel* m_highresolution_video; - - QLabel* m_labelAfterTimeout; - QLabel* m_labelWait; - - QGroupBox* m_groupPlay; - QGroupBox* m_groupPbc; - QGroupBox* m_groupKey; - QWidget* m_widgetnumkeys; + TQLabel* m_labelMimeType; + TQLabel* m_displaySize; + TQLabel* m_displayLength; + TQLabel* m_muxrate; + + TQLabel* m_mpegver_audio; + TQLabel* m_rate_audio; + TQLabel* m_sampling_frequency_audio; + TQLabel* m_mode_audio; + TQLabel* m_copyright_audio; + + TQLabel* m_mpegver_video; + TQLabel* m_rate_video; + TQLabel* m_chromaformat_video; + TQLabel* m_format_video; + TQLabel* m_resolution_video; + TQLabel* m_highresolution_video; + + TQLabel* m_labelAfterTimeout; + TQLabel* m_labelWait; + + TQGroupBox* m_groupPlay; + TQGroupBox* m_groupPbc; + TQGroupBox* m_groupKey; + TQWidget* m_widgetnumkeys; K3bCutComboBox* m_pbc_previous; K3bCutComboBox* m_pbc_next; @@ -94,14 +95,14 @@ class K3bVcdTrackDialog : public KDialogBase K3bCutComboBox* m_pbc_default; K3bCutComboBox* m_comboAfterTimeout; - QCheckBox* m_check_reactivity; - QCheckBox* m_check_pbc; - QCheckBox* m_check_usekeys; - QCheckBox* m_check_overwritekeys; + TQCheckBox* m_check_reactivity; + TQCheckBox* m_check_pbc; + TQCheckBox* m_check_usekeys; + TQCheckBox* m_check_overwritekeys; K3bListView* m_list_keys; - QSpinBox* m_spin_times; - QSpinBox* m_spin_waittime; + TQSpinBox* m_spin_times; + TQSpinBox* m_spin_waittime; void prepareGui(); void setupPbcTab(); @@ -113,7 +114,7 @@ class K3bVcdTrackDialog : public KDialogBase void setPbcTrack( K3bVcdTrack*, K3bCutComboBox*, int ); void setDefinedNumKeys( ); - QString displayName( K3bVcdTrack* ); + TQString displayName( K3bVcdTrack* ); K3bVcdOptions* VcdOptions() { return m_vcdDoc->vcdOptions(); diff --git a/src/projects/k3bvcdview.cpp b/src/projects/k3bvcdview.cpp index d8984d4..852928f 100644 --- a/src/projects/k3bvcdview.cpp +++ b/src/projects/k3bvcdview.cpp @@ -14,8 +14,8 @@ */ // QT-includes -#include <qlayout.h> -#include <qstring.h> +#include <tqlayout.h> +#include <tqstring.h> // KDE-includes @@ -34,8 +34,8 @@ #include <k3bcore.h> -K3bVcdView::K3bVcdView( K3bVcdDoc* pDoc, QWidget* parent, const char *name ) - : K3bView( pDoc, parent, name ) +K3bVcdView::K3bVcdView( K3bVcdDoc* pDoc, TQWidget* tqparent, const char *name ) + : K3bView( pDoc, tqparent, name ) { m_doc = pDoc; @@ -45,17 +45,17 @@ K3bVcdView::K3bVcdView( K3bVcdDoc* pDoc, QWidget* parent, const char *name ) setMainWidget( m_vcdlist ); fillStatusDisplay() ->showSize(); - connect( m_vcdlist, SIGNAL( lengthReady() ), fillStatusDisplay(), SLOT( update() ) ); - connect( m_doc, SIGNAL( newTracks() ), fillStatusDisplay(), SLOT( update() ) ); + connect( m_vcdlist, TQT_SIGNAL( lengthReady() ), fillStatusDisplay(), TQT_SLOT( update() ) ); + connect( m_doc, TQT_SIGNAL( newTracks() ), fillStatusDisplay(), TQT_SLOT( update() ) ); } K3bVcdView::~K3bVcdView() {} -K3bProjectBurnDialog* K3bVcdView::newBurnDialog( QWidget * parent, const char * name ) +K3bProjectBurnDialog* K3bVcdView::newBurnDialog( TQWidget * tqparent, const char * name ) { - return new K3bVcdBurnDialog( m_doc, parent, name, true ); + return new K3bVcdBurnDialog( m_doc, tqparent, name, true ); } diff --git a/src/projects/k3bvcdview.h b/src/projects/k3bvcdview.h index 77ad292..a58a465 100644 --- a/src/projects/k3bvcdview.h +++ b/src/projects/k3bvcdview.h @@ -16,18 +16,18 @@ #ifndef K3BVCDVIEW_H #define K3BVCDVIEW_H -#include <qstringlist.h> -#include <qptrlist.h> +#include <tqstringlist.h> +#include <tqptrlist.h> // K3b Includes #include <k3bview.h> class K3bVcdListView; class K3bVcdListViewItem; -class QWidget; +class TQWidget; class K3bVcdDoc; class K3bVcdTrack; -class QListViewItem; +class TQListViewItem; class KListView; class K3bVcdBurnDialog; class K3bProjectBurnDialog; @@ -36,13 +36,14 @@ class K3bProjectBurnDialog; class K3bVcdView : public K3bView { Q_OBJECT + TQ_OBJECT public: - K3bVcdView( K3bVcdDoc* pDoc, QWidget* parent, const char *name = 0 ); + K3bVcdView( K3bVcdDoc* pDoc, TQWidget* tqparent, const char *name = 0 ); ~K3bVcdView(); protected: - K3bProjectBurnDialog* newBurnDialog( QWidget* parent = 0, const char* name = 0 ); + K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); void init(); diff --git a/src/projects/k3bvideodvdburndialog.cpp b/src/projects/k3bvideodvdburndialog.cpp index 22626df..d7602b0 100644 --- a/src/projects/k3bvideodvdburndialog.cpp +++ b/src/projects/k3bvideodvdburndialog.cpp @@ -32,27 +32,27 @@ #include <kio/global.h> #include <kmessagebox.h> -#include <qlayout.h> -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> -K3bVideoDvdBurnDialog::K3bVideoDvdBurnDialog( K3bVideoDvdDoc* doc, QWidget *parent, const char *name, bool modal ) - : K3bProjectBurnDialog( doc, parent, name, modal, true ), +K3bVideoDvdBurnDialog::K3bVideoDvdBurnDialog( K3bVideoDvdDoc* doc, TQWidget *tqparent, const char *name, bool modal ) + : K3bProjectBurnDialog( doc, tqparent, name, modal, true ), m_doc( doc ) { prepareGui(); - setTitle( i18n("Video DVD Project"), i18n("Size: %1").arg( KIO::convertSize(doc->size()) ) ); + setTitle( i18n("Video DVD Project"), i18n("Size: %1").tqarg( KIO::convertSize(doc->size()) ) ); // for now we just put the verify checkbox on the main page... m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup ); m_optionGroupLayout->addWidget( m_checkVerify ); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); m_optionGroupLayout->addItem( spacer ); // create image settings tab @@ -63,7 +63,7 @@ K3bVideoDvdBurnDialog::K3bVideoDvdBurnDialog( K3bVideoDvdDoc* doc, QWidget *pare m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE ); - QString path = m_doc->tempDir(); + TQString path = m_doc->tempDir(); if( path.isEmpty() ) { path = K3b::defaultTempPath(); if( m_doc->isoOptions().volumeID().isEmpty() ) @@ -175,17 +175,17 @@ void K3bVideoDvdBurnDialog::slotStartClicked() { if( m_checkOnlyCreateImage->isChecked() || m_checkCacheImage->isChecked() ) { - QFileInfo fi( m_tempDirSelectionWidget->tempPath() ); + TQFileInfo fi( m_tempDirSelectionWidget->tempPath() ); if( fi.isDir() ) m_tempDirSelectionWidget->setTempPath( fi.filePath() + "/image.iso" ); - if( QFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { + if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { if( KMessageBox::warningContinueCancel( this, - i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()), + i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()), i18n("File Exists"), i18n("Overwrite") ) == KMessageBox::Continue ) { // delete the file here to avoid problems with free space in K3bProjectBurnDialog::slotStartClicked - QFile::remove( m_tempDirSelectionWidget->tempPath() ); + TQFile::remove( m_tempDirSelectionWidget->tempPath() ); } else return; diff --git a/src/projects/k3bvideodvdburndialog.h b/src/projects/k3bvideodvdburndialog.h index 0dbbe58..af393d1 100644 --- a/src/projects/k3bvideodvdburndialog.h +++ b/src/projects/k3bvideodvdburndialog.h @@ -22,15 +22,16 @@ class K3bVideoDvdDoc; class K3bDataImageSettingsWidget; -class QCheckBox; +class TQCheckBox; class K3bVideoDvdBurnDialog : public K3bProjectBurnDialog { Q_OBJECT + TQ_OBJECT public: - K3bVideoDvdBurnDialog( K3bVideoDvdDoc*, QWidget *parent = 0, const char *name = 0, bool modal = true ); + K3bVideoDvdBurnDialog( K3bVideoDvdDoc*, TQWidget *tqparent = 0, const char *name = 0, bool modal = true ); ~K3bVideoDvdBurnDialog(); protected slots: @@ -47,7 +48,7 @@ class K3bVideoDvdBurnDialog : public K3bProjectBurnDialog private: K3bDataImageSettingsWidget* m_imageSettingsWidget; - QCheckBox* m_checkVerify; + TQCheckBox* m_checkVerify; K3bVideoDvdDoc* m_doc; }; diff --git a/src/projects/k3bvideodvdview.cpp b/src/projects/k3bvideodvdview.cpp index 277beac..792ffc5 100644 --- a/src/projects/k3bvideodvdview.cpp +++ b/src/projects/k3bvideodvdview.cpp @@ -28,23 +28,23 @@ #include <kmessagebox.h> #include <kactioncollection.h> -#include <qsplitter.h> +#include <tqsplitter.h> -K3bVideoDvdView::K3bVideoDvdView( K3bVideoDvdDoc* doc, QWidget *parent, const char *name ) - : K3bView( doc, parent, name ), +K3bVideoDvdView::K3bVideoDvdView( K3bVideoDvdDoc* doc, TQWidget *tqparent, const char *name ) + : K3bView( doc, tqparent, name ), m_doc(doc) { fillStatusDisplay()->showDvdSizes(true); // --- setup GUI --------------------------------------------------- - QSplitter* mainSplitter = new QSplitter( this ); + TQSplitter* mainSplitter = new TQSplitter( this ); m_dataDirTree = new K3bDataDirTreeView( this, doc, mainSplitter ); m_dataFileView = new K3bDataFileView( this, m_dataDirTree, doc, mainSplitter ); m_dataDirTree->setFileView( m_dataFileView ); setMainWidget( mainSplitter ); - connect( m_dataFileView, SIGNAL(dirSelected(K3bDirItem*)), m_dataDirTree, SLOT(setCurrentDir(K3bDirItem*)) ); + connect( m_dataFileView, TQT_SIGNAL(dirSelected(K3bDirItem*)), m_dataDirTree, TQT_SLOT(setCurrentDir(K3bDirItem*)) ); m_dataDirTree->checkForNewItems(); m_dataFileView->checkForNewItems(); @@ -58,9 +58,9 @@ K3bVideoDvdView::~K3bVideoDvdView() } -K3bProjectBurnDialog* K3bVideoDvdView::newBurnDialog( QWidget* parent, const char* name ) +K3bProjectBurnDialog* K3bVideoDvdView::newBurnDialog( TQWidget* tqparent, const char* name ) { - return new K3bVideoDvdBurnDialog( m_doc, parent, name, true ); + return new K3bVideoDvdBurnDialog( m_doc, tqparent, name, true ); } diff --git a/src/projects/k3bvideodvdview.h b/src/projects/k3bvideodvdview.h index 1125ac4..59dd88d 100644 --- a/src/projects/k3bvideodvdview.h +++ b/src/projects/k3bvideodvdview.h @@ -27,15 +27,16 @@ class K3bDataFileView; class K3bVideoDvdView : public K3bView { Q_OBJECT + TQ_OBJECT public: - K3bVideoDvdView( K3bVideoDvdDoc* doc, QWidget *parent = 0, const char *name = 0 ); + K3bVideoDvdView( K3bVideoDvdDoc* doc, TQWidget *tqparent = 0, const char *name = 0 ); ~K3bVideoDvdView(); void addUrls( const KURL::List& ); protected: - virtual K3bProjectBurnDialog* newBurnDialog( QWidget* parent = 0, const char* name = 0 ); + virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); void init(); diff --git a/src/projects/k3bview.cpp b/src/projects/k3bview.cpp index 0809f59..ccb2656 100644 --- a/src/projects/k3bview.cpp +++ b/src/projects/k3bview.cpp @@ -14,13 +14,13 @@ */ -// include files for Qt -#include <qlayout.h> -#include <qtoolbutton.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qptrlist.h> -#include <qtoolbutton.h> +// include files for TQt +#include <tqlayout.h> +#include <tqtoolbutton.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqptrlist.h> +#include <tqtoolbutton.h> #include <kaction.h> #include <kiconloader.h> @@ -40,11 +40,11 @@ #include <k3bcore.h> -K3bView::K3bView( K3bDoc* pDoc, QWidget *parent, const char* name ) - : QWidget( parent, name ), +K3bView::K3bView( K3bDoc* pDoc, TQWidget *tqparent, const char* name ) + : TQWidget( tqparent, name ), m_doc( pDoc ) { - QGridLayout* grid = new QGridLayout( this ); + TQGridLayout* grid = new TQGridLayout( this ); m_toolBox = new K3bToolBox( this, "toolbox" ); m_fillStatusDisplay = new K3bFillStatusDisplay( m_doc, this ); @@ -57,10 +57,10 @@ K3bView::K3bView( K3bDoc* pDoc, QWidget *parent, const char* name ) grid->setSpacing( 5 ); grid->setMargin( 2 ); - KAction* burnAction = new KAction( i18n("&Burn"), "cdburn", CTRL + Key_B, this, SLOT(slotBurn()), + KAction* burnAction = new KAction( i18n("&Burn"), "cdburn", CTRL + Key_B, TQT_TQOBJECT(this), TQT_SLOT(slotBurn()), actionCollection(), "project_burn"); burnAction->setToolTip( i18n("Open the burn dialog for the current project") ); - KAction* propAction = new KAction( i18n("&Properties"), "edit", CTRL + Key_P, this, SLOT(slotProperties()), + KAction* propAction = new KAction( i18n("&Properties"), "edit", CTRL + Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), actionCollection(), "project_properties"); propAction->setToolTip( i18n("Open the properties dialog") ); @@ -85,9 +85,9 @@ K3bView::~K3bView() } -void K3bView::setMainWidget( QWidget* w ) +void K3bView::setMainWidget( TQWidget* w ) { - static_cast<QGridLayout*>(layout())->addMultiCellWidget( w, 1, 1, 0, 1 ); + static_cast<TQGridLayout*>(tqlayout())->addMultiCellWidget( w, 1, 1, 0, 1 ); } @@ -95,7 +95,7 @@ void K3bView::slotBurn() { if( m_doc->numOfTracks() == 0 || m_doc->size() == 0 ) { KMessageBox::information( this, i18n("Please add files to your project first."), - i18n("No Data to Burn"), QString::null, false ); + i18n("No Data to Burn"), TQString(), false ); } else { K3bProjectBurnDialog* dlg = newBurnDialog( this ); @@ -131,16 +131,16 @@ void K3bView::slotProperties() void K3bView::addPluginButtons( int projectType ) { - QPtrList<K3bPlugin> pl = k3bcore->pluginManager()->plugins( "ProjectPlugin" ); - for( QPtrListIterator<K3bPlugin> it( pl ); *it; ++it ) { + TQPtrList<K3bPlugin> pl = k3bcore->pluginManager()->plugins( "ProjectPlugin" ); + for( TQPtrListIterator<K3bPlugin> it( pl ); *it; ++it ) { K3bProjectPlugin* pp = dynamic_cast<K3bProjectPlugin*>( *it ); if( pp && (pp->type() & projectType) ) { - QToolButton* button = toolBox()->addButton( pp->text(), + TQToolButton* button = toolBox()->addButton( pp->text(), pp->icon(), pp->toolTip(), pp->whatsThis(), - this, - SLOT(slotPluginButtonClicked()) ); + TQT_TQOBJECT(this), + TQT_SLOT(slotPluginButtonClicked()) ); m_plugins.insert( static_cast<void*>(button), pp ); } } @@ -149,7 +149,7 @@ void K3bView::addPluginButtons( int projectType ) void K3bView::slotPluginButtonClicked() { - QObject* o = const_cast<QObject*>(sender()); + TQObject* o = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); if( K3bProjectPlugin* p = m_plugins[static_cast<void*>(o)] ) { if( p->hasGUI() ) { K3bProjectPluginDialog dlg( p, doc(), this ); diff --git a/src/projects/k3bview.h b/src/projects/k3bview.h index 2bd8266..9ca4438 100644 --- a/src/projects/k3bview.h +++ b/src/projects/k3bview.h @@ -21,9 +21,9 @@ #include <config.h> #endif -// include files for Qt -#include <qwidget.h> -#include <qptrdict.h> +// include files for TQt +#include <tqwidget.h> +#include <tqptrdict.h> #include <kxmlguiclient.h> #include <kurl.h> @@ -39,15 +39,16 @@ class K3bProjectPlugin; /** * */ -class K3bView : public QWidget, public KXMLGUIClient +class K3bView : public TQWidget, public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: /** * */ - K3bView( K3bDoc* pDoc, QWidget* parent, const char *name = 0 ); + K3bView( K3bDoc* pDoc, TQWidget* tqparent, const char *name = 0 ); virtual ~K3bView(); /** @@ -57,7 +58,7 @@ class K3bView : public QWidget, public KXMLGUIClient K3bDoc* getDocument() const { return m_doc; } K3bDoc* doc() const { return m_doc; } - void setMainWidget( QWidget* ); + void setMainWidget( TQWidget* ); public slots: /** @@ -85,7 +86,7 @@ class K3bView : public QWidget, public KXMLGUIClient /** * Protected since the BurnDialog is not part of the API. */ - virtual K3bProjectBurnDialog* newBurnDialog( QWidget* = 0, const char* = 0 ) = 0; + virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* = 0, const char* = 0 ) = 0; /** * Call this to add the projectplugin buttons to the toolbox. It is not called @@ -106,7 +107,7 @@ class K3bView : public QWidget, public KXMLGUIClient K3bFillStatusDisplay* m_fillStatusDisplay; K3bToolBox* m_toolBox; - QPtrDict<K3bProjectPlugin> m_plugins; + TQPtrDict<K3bProjectPlugin> m_plugins; }; #endif // K3BVIEW_H diff --git a/src/projects/kostore/koStore.cc b/src/projects/kostore/koStore.cc index 5e7fd06..1b17d95 100644 --- a/src/projects/kostore/koStore.cc +++ b/src/projects/kostore/koStore.cc @@ -28,9 +28,9 @@ #include "koZipStore.h" //#include "koDirectoryStore.h" -#include <qfileinfo.h> -#include <qfile.h> -#include <qdir.h> +#include <tqfileinfo.h> +#include <tqfile.h> +#include <tqdir.h> #include <kurl.h> #include <kdebug.h> @@ -44,7 +44,7 @@ const int KoStore::s_area = 30002; -KoStore::Backend KoStore::determineBackend( QIODevice* dev ) +KoStore::Backend KoStore::determineBackend( TQIODevice* dev ) { unsigned char buf[5]; if ( dev->readBlock( (char *)buf, 4 ) < 4 ) @@ -56,21 +56,21 @@ KoStore::Backend KoStore::determineBackend( QIODevice* dev ) return DefaultFormat; // fallback } -KoStore* KoStore::createStore( const QString& fileName, Mode mode, const QCString & appIdentification, Backend backend ) +KoStore* KoStore::createStore( const TQString& fileName, Mode mode, const TQCString & appIdentification, Backend backend ) { if ( backend == Auto ) { if ( mode == KoStore::Write ) backend = DefaultFormat; else { - QFileInfo inf( fileName ); + TQFileInfo inf( fileName ); if ( inf.isDir() ) backend = Directory; else { - QFile file( fileName ); + TQFile file( fileName ); if ( file.open( IO_ReadOnly ) ) - backend = determineBackend( &file ); + backend = determineBackend( TQT_TQIODEVICE(&file) ); else backend = DefaultFormat; // will create a "bad" store (bad()==true) } @@ -90,7 +90,7 @@ KoStore* KoStore::createStore( const QString& fileName, Mode mode, const QCStrin } } -KoStore* KoStore::createStore( QIODevice *device, Mode mode, const QCString & appIdentification, Backend backend ) +KoStore* KoStore::createStore( TQIODevice *device, Mode mode, const TQCString & appIdentification, Backend backend ) { if ( backend == Auto ) { @@ -118,12 +118,12 @@ KoStore* KoStore::createStore( QIODevice *device, Mode mode, const QCString & ap } } -KoStore* KoStore::createStore( QWidget* window, const KURL& url, Mode mode, const QCString & appIdentification, Backend backend ) +KoStore* KoStore::createStore( TQWidget* window, const KURL& url, Mode mode, const TQCString & appIdentification, Backend backend ) { if ( url.isLocalFile() ) return createStore(url.path(), mode, appIdentification, backend ); - QString tmpFile; + TQString tmpFile; if ( mode == KoStore::Write ) { if ( backend == Auto ) @@ -141,10 +141,10 @@ KoStore* KoStore::createStore( QWidget* window, const KURL& url, Mode mode, cons } else if ( backend == Auto ) { - QFile file( tmpFile ); + TQFile file( tmpFile ); if ( file.open( IO_ReadOnly ) ) { - backend = determineBackend( &file ); + backend = determineBackend( TQT_TQIODEVICE(&file) ); file.close(); } } @@ -186,7 +186,7 @@ KoStore::~KoStore() delete m_stream; } -bool KoStore::open( const QString & _name ) +bool KoStore::open( const TQString & _name ) { // This also converts from relative to absolute, i.e. merges the currentPath() m_sName = toExternalNaming( _name ); @@ -208,7 +208,7 @@ bool KoStore::open( const QString & _name ) if ( m_mode == Write ) { kdDebug(s_area) << "KoStore: opening for writing '" << m_sName << "'" << endl; - if ( m_strFiles.findIndex( m_sName ) != -1 ) // just check if it's there + if ( m_strFiles.tqfindIndex( m_sName ) != -1 ) // just check if it's there { kdWarning(s_area) << "KoStore: Duplicate filename " << m_sName << endl; //return KIO::ERR_FILE_ALREADY_EXIST; @@ -259,7 +259,7 @@ bool KoStore::close() return ret; } -QIODevice* KoStore::device() const +TQIODevice* KoStore::device() const { if ( !m_bIsOpen ) kdWarning(s_area) << "KoStore: You must open before asking for a device" << endl; @@ -268,9 +268,9 @@ QIODevice* KoStore::device() const return m_stream; } -QByteArray KoStore::read( unsigned long int max ) +TQByteArray KoStore::read( unsigned long int max ) { - QByteArray data; // Data is a QArray<char> + TQByteArray data; // Data is a TQArray<char> if ( !m_bIsOpen ) { @@ -306,12 +306,12 @@ QByteArray KoStore::read( unsigned long int max ) return data; } -Q_LONG KoStore::write( const QByteArray& data ) +TQ_LONG KoStore::write( const TQByteArray& data ) { return write( data.data(), data.size() ); // see below } -Q_LONG KoStore::read( char *_buffer, Q_ULONG _len ) +TQ_LONG KoStore::read( char *_buffer, TQ_ULONG _len ) { if ( !m_bIsOpen ) { @@ -335,7 +335,7 @@ Q_LONG KoStore::read( char *_buffer, Q_ULONG _len ) return m_stream->readBlock( _buffer, _len ); } -Q_LONG KoStore::write( const char* _data, Q_ULONG _len ) +TQ_LONG KoStore::write( const char* _data, TQ_ULONG _len ) { if ( _len == 0L ) return 0; @@ -357,29 +357,29 @@ Q_LONG KoStore::write( const char* _data, Q_ULONG _len ) return nwritten; } -QIODevice::Offset KoStore::size() const +TQIODevice::Offset KoStore::size() const { if ( !m_bIsOpen ) { kdWarning(s_area) << "KoStore: You must open before asking for a size" << endl; - return static_cast<QIODevice::Offset>(-1); + return static_cast<TQIODevice::Offset>(-1); } if ( m_mode != Read ) { kdWarning(s_area) << "KoStore: Can not get size from store that is opened for writing" << endl; - return static_cast<QIODevice::Offset>(-1); + return static_cast<TQIODevice::Offset>(-1); } return m_iSize; } -bool KoStore::enterDirectory( const QString& directory ) +bool KoStore::enterDirectory( const TQString& directory ) { //kdDebug(s_area) << "KoStore::enterDirectory " << directory << endl; int pos; bool success = true; - QString tmp( directory ); + TQString tmp( directory ); - while ( ( pos = tmp.find( '/' ) ) != -1 && + while ( ( pos = tmp.tqfind( '/' ) ) != -1 && ( success = enterDirectoryInternal( tmp.left( pos ) ) ) ) tmp = tmp.mid( pos + 1 ); @@ -398,16 +398,16 @@ bool KoStore::leaveDirectory() return enterAbsoluteDirectory( expandEncodedDirectory( currentPath() ) ); } -QString KoStore::currentDirectory() const +TQString KoStore::currentDirectory() const { return expandEncodedDirectory( currentPath() ); } -QString KoStore::currentPath() const +TQString KoStore::currentPath() const { - QString path; - QStringList::ConstIterator it = m_currentPath.begin(); - QStringList::ConstIterator end = m_currentPath.end(); + TQString path; + TQStringList::ConstIterator it = m_currentPath.begin(); + TQStringList::ConstIterator end = m_currentPath.end(); for ( ; it != end; ++it ) { path += *it; path += '/'; @@ -423,15 +423,15 @@ void KoStore::pushDirectory() void KoStore::popDirectory() { m_currentPath.clear(); - enterAbsoluteDirectory( QString::null ); + enterAbsoluteDirectory( TQString() ); enterDirectory( m_directoryStack.pop() ); } -bool KoStore::addLocalFile( const QString &fileName, const QString &destName ) +bool KoStore::addLocalFile( const TQString &fileName, const TQString &destName ) { - QFileInfo fi( fileName ); + TQFileInfo fi( fileName ); uint size = fi.size(); - QFile file( fileName ); + TQFile file( fileName ); if ( !file.open( IO_ReadOnly )) { return false; @@ -442,7 +442,7 @@ bool KoStore::addLocalFile( const QString &fileName, const QString &destName ) return false; } - QByteArray data ( 8 * 1024 ); + TQByteArray data ( 8 * 1024 ); uint total = 0; for ( int block = 0; ( block = file.readBlock ( data.data(), data.size() ) ) > 0; total += block ) @@ -460,12 +460,12 @@ bool KoStore::addLocalFile( const QString &fileName, const QString &destName ) return true; } -bool KoStore::extractFile ( const QString &srcName, const QString &fileName ) +bool KoStore::extractFile ( const TQString &srcName, const TQString &fileName ) { if ( !open ( srcName ) ) return false; - QFile file( fileName ); + TQFile file( fileName ); if( !file.open ( IO_WriteOnly ) ) { @@ -473,14 +473,14 @@ bool KoStore::extractFile ( const QString &srcName, const QString &fileName ) return false; } - QByteArray data ( 8 * 1024 ); + TQByteArray data ( 8 * 1024 ); uint total = 0; for( int block = 0; ( block = read ( data.data(), data.size() ) ) > 0; total += block ) { file.writeBlock ( data.data(), block ); } - if( size() != static_cast<QIODevice::Offset>(-1) ) + if( size() != static_cast<TQIODevice::Offset>(-1) ) Q_ASSERT( total == size() ); file.close(); @@ -489,25 +489,25 @@ bool KoStore::extractFile ( const QString &srcName, const QString &fileName ) return true; } -QStringList KoStore::addLocalDirectory( const QString &dirPath, const QString &destName ) +TQStringList KoStore::addLocalDirectory( const TQString &dirPath, const TQString &destName ) { - QString dot = "."; - QString dotdot = ".."; - QStringList content; + TQString dot = "."; + TQString dotdot = ".."; + TQStringList content; - QDir dir(dirPath); + TQDir dir(dirPath); if ( !dir.exists() ) return 0; - QStringList files = dir.entryList(); - for ( QStringList::Iterator it = files.begin(); it != files.end(); ++it ) + TQStringList files = dir.entryList(); + for ( TQStringList::Iterator it = files.begin(); it != files.end(); ++it ) { if ( *it != dot && *it != dotdot ) { - QString currentFile = dirPath + "/" + *it; - QString dest = destName.isEmpty() ? *it : (destName + "/" + *it); + TQString currentFile = dirPath + "/" + *it; + TQString dest = destName.isEmpty() ? *it : (destName + "/" + *it); - QFileInfo fi ( currentFile ); + TQFileInfo fi ( currentFile ); if ( fi.isFile() ) { addLocalFile ( currentFile, dest ); @@ -524,12 +524,12 @@ QStringList KoStore::addLocalDirectory( const QString &dirPath, const QString &d } -bool KoStore::at( QIODevice::Offset pos ) +bool KoStore::at( TQIODevice::Offset pos ) { return m_stream->at( pos ); } -QIODevice::Offset KoStore::at() const +TQIODevice::Offset KoStore::at() const { return m_stream->at(); } @@ -540,12 +540,12 @@ bool KoStore::atEnd() const } // See the specification for details of what this function does. -QString KoStore::toExternalNaming( const QString & _internalNaming ) const +TQString KoStore::toExternalNaming( const TQString & _internalNaming ) const { if ( _internalNaming == ROOTPART ) return expandEncodedDirectory( currentPath() ) + MAINNAME; - QString intern; + TQString intern; if ( _internalNaming.startsWith( "tar:/" ) ) // absolute reference intern = _internalNaming.mid( 5 ); // remove protocol else @@ -554,22 +554,22 @@ QString KoStore::toExternalNaming( const QString & _internalNaming ) const return expandEncodedPath( intern ); } -QString KoStore::expandEncodedPath( QString intern ) const +TQString KoStore::expandEncodedPath( TQString intern ) const { if ( m_namingVersion == NAMING_VERSION_RAW ) return intern; - QString result; + TQString result; int pos; - if ( ( pos = intern.findRev( '/', -1 ) ) != -1 ) { + if ( ( pos = intern.tqfindRev( '/', -1 ) ) != -1 ) { result = expandEncodedDirectory( intern.left( pos ) ) + '/'; intern = intern.mid( pos + 1 ); } // Now process the filename. If the first character is numeric, we have // a main document. - if ( QChar(intern.at(0)).isDigit() ) + if ( TQChar(intern.at(0)).isDigit() ) { // If this is the first part name, check if we have a store with // old-style names. @@ -588,27 +588,27 @@ QString KoStore::expandEncodedPath( QString intern ) const return result; } -QString KoStore::expandEncodedDirectory( QString intern ) const +TQString KoStore::expandEncodedDirectory( TQString intern ) const { if ( m_namingVersion == NAMING_VERSION_RAW ) return intern; - QString result; + TQString result; int pos; - while ( ( pos = intern.find( '/' ) ) != -1 ) { - if ( QChar(intern.at(0)).isDigit() ) + while ( ( pos = intern.tqfind( '/' ) ) != -1 ) { + if ( TQChar(intern.at(0)).isDigit() ) result += "part"; result += intern.left( pos + 1 ); // copy numbers (or "pictures") + "/" intern = intern.mid( pos + 1 ); // remove the dir we just processed } - if ( QChar(intern.at(0)).isDigit() ) + if ( TQChar(intern.at(0)).isDigit() ) result += "part"; result += intern; return result; } -bool KoStore::enterDirectoryInternal( const QString& directory ) +bool KoStore::enterDirectoryInternal( const TQString& directory ) { if ( enterRelativeDirectory( expandEncodedDirectory( directory ) ) ) { @@ -623,7 +623,7 @@ void KoStore::disallowNameExpansion( void ) m_namingVersion = NAMING_VERSION_RAW; } -bool KoStore::hasFile( const QString& fileName ) const +bool KoStore::hasFile( const TQString& fileName ) const { return fileExists( toExternalNaming( currentPath() + fileName ) ); } diff --git a/src/projects/kostore/koStore.h b/src/projects/kostore/koStore.h index a22c5f3..331bc8b 100644 --- a/src/projects/kostore/koStore.h +++ b/src/projects/kostore/koStore.h @@ -21,16 +21,16 @@ #ifndef __koStore_h_ #define __koStore_h_ -#include <qstring.h> -#include <qstringlist.h> -#include <qiodevice.h> -#include <qvaluestack.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqiodevice.h> +#include <tqvaluestack.h> //#include <koffice_export.h> #include <kdemacros.h> #define KOSTORE_EXPORT KDE_EXPORT -class QWidget; +class TQWidget; class KURL; @@ -61,14 +61,14 @@ public: * to be written in the file for "mime-magic" identification. * Only meaningful if mode is Write, and if backend!=Directory. */ - static KoStore* createStore( const QString& fileName, Mode mode, const QCString & appIdentification = "", Backend backend = Auto ); + static KoStore* createStore( const TQString& fileName, Mode mode, const TQCString & appIdentification = "", Backend backend = Auto ); /** - * Create a store for any kind of QIODevice: file, memory buffer... - * KoStore will take care of opening the QIODevice. + * Create a store for any kind of TQIODevice: file, memory buffer... + * KoStore will take care of opening the TQIODevice. * This method doesn't support the Directory store! */ - static KoStore* createStore( QIODevice *device, Mode mode, const QCString & appIdentification = "", Backend backend = Auto ); + static KoStore* createStore( TQIODevice *device, Mode mode, const TQCString & appIdentification = "", Backend backend = Auto ); /** * Open a store (i.e. the representation on disk of a KOffice document). @@ -90,7 +90,7 @@ public: * @since 1.4 * @bug saving not completely implemented (fixed temporary file) */ - static KoStore* createStore( QWidget* window, const KURL& url, Mode mode, const QCString & appIdentification = "", Backend backend = Auto ); + static KoStore* createStore( TQWidget* window, const KURL& url, Mode mode, const TQCString & appIdentification = "", Backend backend = Auto ); /** * Destroys the store (i.e. closes the file on the hard disk) @@ -103,7 +103,7 @@ public: * If the tar:/ prefix is missing it's assumed to be a relative URI. * @return true on success. */ - bool open( const QString & name ); + bool open( const TQString & name ); /** * Check whether a file inside the store is currently opened with open(), @@ -123,38 +123,38 @@ public: * (slightly faster than read() calls) * You need to call @ref open first, and @ref close afterwards. */ - QIODevice* device() const; + TQIODevice* device() const; /** * Read data from the currently opened file. You can also use the streams * for this. */ - QByteArray read( unsigned long int max ); + TQByteArray read( unsigned long int max ); /** * Write data into the currently opened file. You can also use the streams * for this. */ - Q_LONG write( const QByteArray& _data ); + TQ_LONG write( const TQByteArray& _data ); /** * Read data from the currently opened file. You can also use the streams * for this. * @return size of data read, -1 on error */ - Q_LONG read( char *_buffer, Q_ULONG _len ); + TQ_LONG read( char *_buffer, TQ_ULONG _len ); /** * Write data into the currently opened file. You can also use the streams * for this. */ - virtual Q_LONG write( const char* _data, Q_ULONG _len ); + virtual TQ_LONG write( const char* _data, TQ_ULONG _len ); /** * @return the size of the currently opened file, -1 on error. * Can be used as an argument for the read methods, for instance */ - QIODevice::Offset size() const; + TQIODevice::Offset size() const; /** * @return true if an error occurred @@ -175,7 +175,7 @@ public: * opening a stream. * Note: Operates on internal names */ - bool enterDirectory( const QString& directory ); + bool enterDirectory( const TQString& directory ); /** * Leaves a directory. Equivalent to "cd .." @@ -188,13 +188,13 @@ public: * Returns the current path including a trailing slash. * Note: Returns a path in "internal name" style */ - QString currentPath() const; + TQString currentPath() const; /** * Returns the current directory. * Note: Returns a path in "internal name" style */ - QString currentDirectory() const; + TQString currentDirectory() const; /** @@ -213,14 +213,14 @@ public: * @return true if the given file exists in the current directory, * i.e. if open(fileName) will work. */ - bool hasFile( const QString& fileName ) const; + bool hasFile( const TQString& fileName ) const; /** * Imports a local file into a store * @param fileName file on hard disk * @param destName file in the store */ - bool addLocalFile( const QString &fileName, const QString &destName ); + bool addLocalFile( const TQString &fileName, const TQString &destName ); /** * Imports a local directory @@ -228,7 +228,7 @@ public: * @param dest path in the store where the directory should get saved * @return the directory index */ - QStringList addLocalDirectory( const QString &dirPath, const QString &dest ); + TQStringList addLocalDirectory( const TQString &dirPath, const TQString &dest ); /** @@ -236,12 +236,12 @@ public: * @param srcName file in the store * @param fileName file on a disk */ - bool extractFile( const QString &srcName, const QString &fileName ); + bool extractFile( const TQString &srcName, const TQString &fileName ); //@{ - /// See QIODevice - bool at( QIODevice::Offset pos ); - QIODevice::Offset at() const; + /// See TQIODevice + bool at( TQIODevice::Offset pos ); + TQIODevice::Offset at() const; bool atEnd() const; //@} @@ -267,7 +267,7 @@ protected: * @param name "absolute path" (in the archive) to the file to open * @return true on success */ - virtual bool openWrite( const QString& name ) = 0; + virtual bool openWrite( const TQString& name ) = 0; /** * Open the file @p name in the store, for reading. * On success, this method must set m_stream to a stream from which we can read, @@ -275,7 +275,7 @@ protected: * @param name "absolute path" (in the archive) to the file to open * @return true on success */ - virtual bool openRead( const QString& name ) = 0; + virtual bool openRead( const TQString& name ) = 0; /** * @return true on success @@ -290,21 +290,21 @@ protected: * Enter a subdirectory of the current directory. * The directory might not exist yet in Write mode. */ - virtual bool enterRelativeDirectory( const QString& dirName ) = 0; + virtual bool enterRelativeDirectory( const TQString& dirName ) = 0; /** * Enter a directory where we've been before. * It is guaranteed to always exist. */ - virtual bool enterAbsoluteDirectory( const QString& path ) = 0; + virtual bool enterAbsoluteDirectory( const TQString& path ) = 0; /** * Check if a file exists inside the store. * @param absPath the absolute path inside the store, i.e. not relative to the current directory */ - virtual bool fileExists( const QString& absPath ) const = 0; + virtual bool fileExists( const TQString& absPath ) const = 0; private: - static Backend determineBackend( QIODevice* dev ); + static Backend determineBackend( TQIODevice* dev ); /** * Conversion routine @@ -319,18 +319,18 @@ private: * * see specification (koffice/lib/store/SPEC) for details. */ - QString toExternalNaming( const QString & _internalNaming ) const; + TQString toExternalNaming( const TQString & _internalNaming ) const; /** * Expands a full path name for a stream (directories+filename) */ - QString expandEncodedPath( QString intern ) const; + TQString expandEncodedPath( TQString intern ) const; /** * Expands only directory names(!) * Needed for the path handling code, as we only operate on internal names */ - QString expandEncodedDirectory( QString intern ) const; + TQString expandEncodedDirectory( TQString intern ) const; mutable enum { @@ -343,28 +343,28 @@ private: * Enter *one* single directory. Nothing like foo/bar/bleh allowed. * Performs some checking when in Read mode */ - bool enterDirectoryInternal( const QString& directory ); + bool enterDirectoryInternal( const TQString& directory ); protected: Mode m_mode; /// Store the filenames (with full path inside the archive) when writing, to avoid duplicates - QStringList m_strFiles; + TQStringList m_strFiles; /// The "current directory" (path) - QStringList m_currentPath; + TQStringList m_currentPath; /// Used to push/pop directories to make it easy to save/restore the state - QValueStack<QString> m_directoryStack; + TQValueStack<TQString> m_directoryStack; /// Current filename (between an open() and a close()) - QString m_sName; + TQString m_sName; /// Current size of the file named m_sName - QIODevice::Offset m_iSize; + TQIODevice::Offset m_iSize; /// The stream for the current read or write operation - QIODevice * m_stream; + TQIODevice * m_stream; bool m_bIsOpen; /// Must be set by the constructor. diff --git a/src/projects/kostore/koStoreBase.h b/src/projects/kostore/koStoreBase.h index 0987577..c3792e5 100644 --- a/src/projects/kostore/koStoreBase.h +++ b/src/projects/kostore/koStoreBase.h @@ -44,8 +44,8 @@ protected: */ KURL m_url; FileMode m_fileMode; - QString m_localFileName; - QWidget* m_window; + TQString m_localFileName; + TQWidget* m_window; }; #endif //KOSTORE_BASE_H diff --git a/src/projects/kostore/koStoreDevice.h b/src/projects/kostore/koStoreDevice.h index b245d60..df8cebf 100644 --- a/src/projects/kostore/koStoreDevice.h +++ b/src/projects/kostore/koStoreDevice.h @@ -23,11 +23,11 @@ #include "koStore.h" /** - * This class implements a QIODevice around KoStore, so that - * it can be used to create a QDomDocument from it, to be written or read - * using QDataStream or to be written using QTextStream + * This class implements a TQIODevice around KoStore, so that + * it can be used to create a TQDomDocument from it, to be written or read + * using TQDataStream or to be written using TQTextStream */ -class KoStoreDevice : public QIODevice +class KoStoreDevice : public TQIODevice { public: /// Note: KoStore::open() should be called before calling this. @@ -46,17 +46,26 @@ public: void close() { } void flush() { } +#ifdef USE_QT4 + inline qint64 readData ( char * data, qint64 maxSize ) { return readBlock(data, maxSize); } + inline qint64 writeData ( const char * data, qint64 maxSize ) { return writeBlock(data, maxSize); } +#endif // USE_QT4 + +#ifdef USE_QT4 + qint64 size() const { +#else // USE_QT4 Offset size() const { +#endif // USE_QT4 if ( m_store->mode() == KoStore::Read ) return m_store->size(); else return 0xffffffff; } - virtual Q_LONG readBlock( char *data, Q_ULONG maxlen ) { return m_store->read(data, maxlen); } - virtual Q_LONG writeBlock( const char *data, Q_ULONG len ) { return m_store->write( data, len ); } + virtual TQ_LONG readBlock( char *data, TQ_ULONG maxlen ) { return m_store->read(data, maxlen); } + virtual TQ_LONG writeBlock( const char *data, TQ_ULONG len ) { return m_store->write( data, len ); } // Not virtual, only to uncover shadow - Q_LONG writeBlock( const QByteArray& data ) { return QIODevice::writeBlock( data ); } + TQ_LONG writeBlock( const TQByteArray& data ) { return TQIODevice::writeBlock( data ); } int getch() { char c[2]; @@ -76,7 +85,7 @@ public: } int ungetch( int ) { return -1; } // unsupported - // See QIODevice + // See TQIODevice virtual bool at( Offset pos ) { return m_store->at(pos); } virtual Offset at() const { return m_store->at(); } virtual bool atEnd() const { return m_store->atEnd(); } diff --git a/src/projects/kostore/koZipStore.cc b/src/projects/kostore/koZipStore.cc index ed3fec4..4b63a4c 100644 --- a/src/projects/kostore/koZipStore.cc +++ b/src/projects/kostore/koZipStore.cc @@ -19,7 +19,7 @@ #include "koZipStore.h" -#include <qbuffer.h> +#include <tqbuffer.h> #include <kzip.h> #include <kdebug.h> @@ -27,11 +27,11 @@ #include <kurl.h> #include <kio/netaccess.h> #if ! KDE_IS_VERSION( 3, 4, 1 ) -#include <qdir.h> -#include <qfileinfo.h> +#include <tqdir.h> +#include <tqfileinfo.h> #endif -KoZipStore::KoZipStore( const QString & _filename, Mode _mode, const QCString & appIdentification ) +KoZipStore::KoZipStore( const TQString & _filename, Mode _mode, const TQCString & appIdentification ) { kdDebug(s_area) << "KoZipStore Constructor filename = " << _filename << " mode = " << int(_mode) @@ -42,8 +42,8 @@ KoZipStore::KoZipStore( const QString & _filename, Mode _mode, const QCString & #if ! KDE_IS_VERSION( 3, 4, 1 ) // Workaround for KZip KSaveFile double deletion in kdelibs-3.4, // when trying to write to a non-writable directory. - QDir dir( QFileInfo( _filename ).dir() ); - if (_mode == Write && !QFileInfo( dir.path() ).isWritable() ) + TQDir dir( TQFileInfo( _filename ).dir() ); + if (_mode == Write && !TQFileInfo( dir.path() ).isWritable() ) { kdWarning(s_area) << dir.path() << " isn't writable" << endl; m_bGood = false; @@ -57,13 +57,13 @@ KoZipStore::KoZipStore( const QString & _filename, Mode _mode, const QCString & } } -KoZipStore::KoZipStore( QIODevice *dev, Mode mode, const QCString & appIdentification ) +KoZipStore::KoZipStore( TQIODevice *dev, Mode mode, const TQCString & appIdentification ) { m_pZip = new KZip( dev ); m_bGood = init( mode, appIdentification ); } -KoZipStore::KoZipStore( QWidget* window, const KURL & _url, const QString & _filename, Mode _mode, const QCString & appIdentification ) +KoZipStore::KoZipStore( TQWidget* window, const KURL & _url, const TQString & _filename, Mode _mode, const TQCString & appIdentification ) { kdDebug(s_area) << "KoZipStore Constructor url" << _url.prettyURL() << " filename = " << _filename @@ -107,7 +107,7 @@ KoZipStore::~KoZipStore() } } -bool KoZipStore::init( Mode _mode, const QCString& appIdentification ) +bool KoZipStore::init( Mode _mode, const TQCString& appIdentification ) { KoStore::init( _mode ); m_currentDir = 0; @@ -129,12 +129,12 @@ bool KoZipStore::init( Mode _mode, const QCString& appIdentification ) return good; } -bool KoZipStore::openWrite( const QString& name ) +bool KoZipStore::openWrite( const TQString& name ) { #if 0 // Prepare memory buffer for writing m_byteArray.resize( 0 ); - m_stream = new QBuffer( m_byteArray ); + m_stream = new TQBuffer( m_byteArray ); m_stream->open( IO_WriteOnly ); return true; #endif @@ -142,7 +142,7 @@ bool KoZipStore::openWrite( const QString& name ) return m_pZip->prepareWriting( name, "", "" /*m_pZip->rootDir()->user(), m_pZip->rootDir()->group()*/, 0 ); } -bool KoZipStore::openRead( const QString& name ) +bool KoZipStore::openRead( const TQString& name ) { const KArchiveEntry * entry = m_pZip->directory()->entry( name ); if ( entry == 0L ) @@ -165,7 +165,7 @@ bool KoZipStore::openRead( const QString& name ) return true; } -Q_LONG KoZipStore::write( const char* _data, Q_ULONG _len ) +TQ_LONG KoZipStore::write( const char* _data, TQ_ULONG _len ) { if ( _len == 0L ) return 0; //kdDebug(s_area) << "KoZipStore::write " << _len << endl; @@ -200,7 +200,7 @@ bool KoZipStore::closeWrite() #endif } -bool KoZipStore::enterRelativeDirectory( const QString& dirName ) +bool KoZipStore::enterRelativeDirectory( const TQString& dirName ) { if ( m_mode == Read ) { if ( !m_currentDir ) { @@ -218,7 +218,7 @@ bool KoZipStore::enterRelativeDirectory( const QString& dirName ) return true; } -bool KoZipStore::enterAbsoluteDirectory( const QString& path ) +bool KoZipStore::enterAbsoluteDirectory( const TQString& path ) { if ( path.isEmpty() ) { @@ -230,7 +230,7 @@ bool KoZipStore::enterAbsoluteDirectory( const QString& path ) return m_currentDir != 0; } -bool KoZipStore::fileExists( const QString& absPath ) const +bool KoZipStore::fileExists( const TQString& absPath ) const { const KArchiveEntry *entry = m_pZip->directory()->entry( absPath ); return entry && entry->isFile(); diff --git a/src/projects/kostore/koZipStore.h b/src/projects/kostore/koZipStore.h index e87f5e4..557cca3 100644 --- a/src/projects/kostore/koZipStore.h +++ b/src/projects/kostore/koZipStore.h @@ -29,26 +29,26 @@ class KURL; class KoZipStore : public KoStoreBase { public: - KoZipStore( const QString & _filename, Mode _mode, const QCString & appIdentification ); - KoZipStore( QIODevice *dev, Mode mode, const QCString & appIdentification ); + KoZipStore( const TQString & _filename, Mode _mode, const TQCString & appIdentification ); + KoZipStore( TQIODevice *dev, Mode mode, const TQCString & appIdentification ); /** * KURL-constructor * @todo saving not completely implemented (fixed temporary file) * @since 1.4 */ - KoZipStore( QWidget* window, const KURL& _url, const QString & _filename, Mode _mode, const QCString & appIdentification ); + KoZipStore( TQWidget* window, const KURL& _url, const TQString & _filename, Mode _mode, const TQCString & appIdentification ); ~KoZipStore(); - virtual Q_LONG write( const char* _data, Q_ULONG _len ); + virtual TQ_LONG write( const char* _data, TQ_ULONG _len ); protected: - virtual bool init( Mode _mode, const QCString& appIdentification ); - virtual bool openWrite( const QString& name ); - virtual bool openRead( const QString& name ); + virtual bool init( Mode _mode, const TQCString& appIdentification ); + virtual bool openWrite( const TQString& name ); + virtual bool openRead( const TQString& name ); virtual bool closeWrite(); virtual bool closeRead() { return true; } - virtual bool enterRelativeDirectory( const QString& dirName ); - virtual bool enterAbsoluteDirectory( const QString& path ); - virtual bool fileExists( const QString& absPath ) const; + virtual bool enterRelativeDirectory( const TQString& dirName ); + virtual bool enterAbsoluteDirectory( const TQString& path ); + virtual bool fileExists( const TQString& absPath ) const; /// The archive KZip * m_pZip; |