summaryrefslogtreecommitdiffstats
path: root/src/option
diff options
context:
space:
mode:
Diffstat (limited to 'src/option')
-rw-r--r--src/option/Makefile.am20
-rw-r--r--src/option/k3bburningoptiontab.cpp12
-rw-r--r--src/option/k3bburningoptiontab.h2
-rw-r--r--src/option/k3bcddboptiontab.cpp36
-rw-r--r--src/option/k3bcddboptiontab.h2
-rw-r--r--src/option/k3bdeviceoptiontab.cpp2
-rw-r--r--src/option/k3bdeviceoptiontab.h2
-rw-r--r--src/option/k3bdevicewidget.cpp14
-rw-r--r--src/option/k3bdevicewidget.h2
-rw-r--r--src/option/k3bexternalbinoptiontab.h2
-rw-r--r--src/option/k3bexternalbinwidget.cpp6
-rw-r--r--src/option/k3bexternalbinwidget.h2
-rw-r--r--src/option/k3bmiscoptiontab.cpp4
-rw-r--r--src/option/k3bmiscoptiontab.h2
-rw-r--r--src/option/k3bnotifyoptiontab.h2
-rw-r--r--src/option/k3boptiondialog.cpp2
-rw-r--r--src/option/k3boptiondialog.h2
-rw-r--r--src/option/k3bpluginoptiontab.cpp6
-rw-r--r--src/option/k3bpluginoptiontab.h2
-rw-r--r--src/option/k3bthemeoptiontab.cpp16
-rw-r--r--src/option/k3bthemeoptiontab.h2
21 files changed, 60 insertions, 80 deletions
diff --git a/src/option/Makefile.am b/src/option/Makefile.am
deleted file mode 100644
index 7b99dd3..0000000
--- a/src/option/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-AM_CPPFLAGS = -I$(srcdir)/../../libk3b/core \
- -I$(srcdir)/../../libk3bdevice \
- -I$(srcdir)/../../libk3b/plugin \
- -I$(srcdir)/../../libk3b/tools \
- -I$(srcdir)/.. \
- $(all_includes)
-
-METASOURCES = AUTO
-
-noinst_LTLIBRARIES = liboption.la
-
-liboption_la_SOURCES = base_k3bcddboptiontab.ui base_k3bmiscoptiontab.ui \
- base_k3bpluginoptiontab.ui \
- base_k3bthemeoptiontab.ui k3bmiscoptiontab.cpp \
- k3bexternalbinoptiontab.cpp k3bcddboptiontab.cpp \
- k3bburningoptiontab.cpp k3boptiondialog.cpp \
- k3bdeviceoptiontab.cpp k3bnotifyoptiontab.cpp \
- k3bpluginoptiontab.cpp \
- k3bthemeoptiontab.cpp k3bdevicewidget.cpp \
- k3bexternalbinwidget.cpp
diff --git a/src/option/k3bburningoptiontab.cpp b/src/option/k3bburningoptiontab.cpp
index 6c4079e..5da5bff 100644
--- a/src/option/k3bburningoptiontab.cpp
+++ b/src/option/k3bburningoptiontab.cpp
@@ -59,7 +59,7 @@ void K3bBurningOptionTab::setupGui()
groupAdvancedLayout->setMargin( 0 );
- TQGroupBox* groupWritingApp = new TQGroupBox( 0, Qt::Vertical, i18n("Burning"), this );
+ TQGroupBox* groupWritingApp = new TQGroupBox( 0, TQt::Vertical, i18n("Burning"), this );
groupWritingApp->layout()->setMargin( 0 );
TQGridLayout* bufferLayout = new TQGridLayout( groupWritingApp->layout() );
bufferLayout->setMargin( KDialog::marginHint() );
@@ -80,7 +80,7 @@ void K3bBurningOptionTab::setupGui()
bufferLayout->addMultiCellWidget( m_checkAllowWritingAppSelection, 4, 4, 0, 2 );
bufferLayout->setColStretch( 2, 1 );
- TQGroupBox* groupMisc = new TQGroupBox( 2, Qt::Vertical, i18n("Miscellaneous"), this );
+ TQGroupBox* groupMisc = new TQGroupBox( 2, TQt::Vertical, i18n("Miscellaneous"), this );
m_checkEject = new TQCheckBox( i18n("Do not &eject medium after write process"), groupMisc );
m_checkAutoErasingRewritable = new TQCheckBox( i18n("Automatically erase CD-RWs and DVD-RWs"), groupMisc );
@@ -89,10 +89,10 @@ void K3bBurningOptionTab::setupGui()
groupAdvancedLayout->setRowStretch( 2, 1 );
- connect( m_checkManualWritingBufferSize, TQT_SIGNAL(toggled(bool)),
- m_editWritingBufferSize, TQT_SLOT(setEnabled(bool)) );
- connect( m_checkManualWritingBufferSize, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(slotSetDefaultBufferSizes(bool)) );
+ connect( m_checkManualWritingBufferSize, TQ_SIGNAL(toggled(bool)),
+ m_editWritingBufferSize, TQ_SLOT(setEnabled(bool)) );
+ connect( m_checkManualWritingBufferSize, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(slotSetDefaultBufferSizes(bool)) );
m_editWritingBufferSize->setDisabled( true );
diff --git a/src/option/k3bburningoptiontab.h b/src/option/k3bburningoptiontab.h
index e466b42..4ded273 100644
--- a/src/option/k3bburningoptiontab.h
+++ b/src/option/k3bburningoptiontab.h
@@ -32,7 +32,7 @@ class TQRadioButton;
class K3bBurningOptionTab : public TQWidget
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/src/option/k3bcddboptiontab.cpp b/src/option/k3bcddboptiontab.cpp
index ba6f704..d34f511 100644
--- a/src/option/k3bcddboptiontab.cpp
+++ b/src/option/k3bcddboptiontab.cpp
@@ -99,24 +99,24 @@ K3bCddbOptionTab::K3bCddbOptionTab( TQWidget* parent, const char* name )
// setup connections
// -----------------------------------------------------------------------------
- connect( m_buttonAddLocalDir, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLocalDirAdd()) );
- connect( m_buttonRemoveLocalDir, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLocalDirRemove()) );
- connect( m_buttonLocalDirUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLocalDirUp()) );
- connect( m_buttonLocalDirDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLocalDirDown()) );
-
- connect( m_buttonAddCddbServer, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCddbServerAdd()) );
- connect( m_buttonRemoveCddbServer, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCddbServerRemove()) );
- connect( m_buttonCddbServerUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCddbServerUp()) );
- connect( m_buttonCddbServerDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCddbServerDown()) );
-
- connect( m_editLocalDir, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(enDisableButtons()) );
- connect( m_editCddbServer, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(enDisableButtons()) );
- connect( m_viewLocalDir, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(enDisableButtons()) );
- connect( m_viewCddbServer, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(enDisableButtons()) );
- connect( m_comboCddbType, TQT_SIGNAL(highlighted(int)),
- this, TQT_SLOT(slotServerTypeChanged()) );
- connect( m_comboCddbType, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotServerTypeChanged()) );
+ connect( m_buttonAddLocalDir, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLocalDirAdd()) );
+ connect( m_buttonRemoveLocalDir, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLocalDirRemove()) );
+ connect( m_buttonLocalDirUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLocalDirUp()) );
+ connect( m_buttonLocalDirDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLocalDirDown()) );
+
+ connect( m_buttonAddCddbServer, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCddbServerAdd()) );
+ connect( m_buttonRemoveCddbServer, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCddbServerRemove()) );
+ connect( m_buttonCddbServerUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCddbServerUp()) );
+ connect( m_buttonCddbServerDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCddbServerDown()) );
+
+ connect( m_editLocalDir, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(enDisableButtons()) );
+ connect( m_editCddbServer, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(enDisableButtons()) );
+ connect( m_viewLocalDir, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(enDisableButtons()) );
+ connect( m_viewCddbServer, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(enDisableButtons()) );
+ connect( m_comboCddbType, TQ_SIGNAL(highlighted(int)),
+ this, TQ_SLOT(slotServerTypeChanged()) );
+ connect( m_comboCddbType, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotServerTypeChanged()) );
// -----------------------------------------------------------------------------
enDisableButtons();
diff --git a/src/option/k3bcddboptiontab.h b/src/option/k3bcddboptiontab.h
index 75ccd46..4c6368b 100644
--- a/src/option/k3bcddboptiontab.h
+++ b/src/option/k3bcddboptiontab.h
@@ -21,7 +21,7 @@
class K3bCddbOptionTab : public base_K3bCddbOptionTab
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/src/option/k3bdeviceoptiontab.cpp b/src/option/k3bdeviceoptiontab.cpp
index 6fe722b..dba6e4a 100644
--- a/src/option/k3bdeviceoptiontab.cpp
+++ b/src/option/k3bdeviceoptiontab.cpp
@@ -56,7 +56,7 @@ K3bDeviceOptionTab::K3bDeviceOptionTab( TQWidget* parent, const char* name )
frameLayout->addWidget( m_labelDevicesInfo, 0, 0 );
frameLayout->addWidget( m_deviceWidget, 1, 0 );
- connect( m_deviceWidget, TQT_SIGNAL(refreshButtonClicked()), this, TQT_SLOT(slotRefreshButtonClicked()) );
+ connect( m_deviceWidget, TQ_SIGNAL(refreshButtonClicked()), this, TQ_SLOT(slotRefreshButtonClicked()) );
}
diff --git a/src/option/k3bdeviceoptiontab.h b/src/option/k3bdeviceoptiontab.h
index e54ead0..3b6638c 100644
--- a/src/option/k3bdeviceoptiontab.h
+++ b/src/option/k3bdeviceoptiontab.h
@@ -25,7 +25,7 @@ class K3bDeviceWidget;
class K3bDeviceOptionTab : public TQWidget
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp
index dcc2486..7b8ccdd 100644
--- a/src/option/k3bdevicewidget.cpp
+++ b/src/option/k3bdevicewidget.cpp
@@ -169,7 +169,7 @@ K3bDeviceWidget::K3bDeviceWidget( K3bDevice::DeviceManager* manager, TQWidget *p
// Devices Box
// ------------------------------------------------
- TQGroupBox* groupDevices = new TQGroupBox( 1, Qt::Vertical, i18n( "CD/DVD Drives" ), this );
+ TQGroupBox* groupDevices = new TQGroupBox( 1, TQt::Vertical, i18n( "CD/DVD Drives" ), this );
groupDevices->layout()->setSpacing( KDialog::spacingHint() );
groupDevices->layout()->setMargin( KDialog::marginHint() );
@@ -198,10 +198,10 @@ K3bDeviceWidget::K3bDeviceWidget( K3bDevice::DeviceManager* manager, TQWidget *p
// connections
// ------------------------------------------------
- // connect( m_buttonRefreshDevices, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRefreshDevices()) );
- connect( m_buttonRefreshDevices, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(refreshButtonClicked()) );
- connect( m_buttonAddDevice, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewDevice()) );
- connect( m_deviceManager, TQT_SIGNAL(changed()), this, TQT_SLOT(init()) );
+ // connect( m_buttonRefreshDevices, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRefreshDevices()) );
+ connect( m_buttonRefreshDevices, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(refreshButtonClicked()) );
+ connect( m_buttonAddDevice, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewDevice()) );
+ connect( m_deviceManager, TQ_SIGNAL(changed()), this, TQ_SLOT(init()) );
// ------------------------------------------------
}
@@ -232,11 +232,11 @@ void K3bDeviceWidget::updateDeviceListViews()
// create the parent view items
// -----------------------------------------
m_writerParentViewItem = new TQListViewItem( m_viewDevices, i18n("Writer Drives") );
- m_writerParentViewItem->setPixmap( 0, SmallIcon( "media-optical-cdwriter" ) );
+ m_writerParentViewItem->setPixmap( 0, SmallIcon( "cd-rw-unmounted" ) );
// spacer item
(void)new TQListViewItem( m_viewDevices );
m_readerParentViewItem = new TQListViewItem( m_viewDevices, i18n("Readonly Drives") );
- m_readerParentViewItem->setPixmap( 0, SmallIcon( "media-optical-cdrom" ) );
+ m_readerParentViewItem->setPixmap( 0, SmallIcon( "media-optical-cdrom-unmounted" ) );
// -----------------------------------------
TQFont fBold( m_viewDevices->font() );
diff --git a/src/option/k3bdevicewidget.h b/src/option/k3bdevicewidget.h
index 310ad3c..76052d4 100644
--- a/src/option/k3bdevicewidget.h
+++ b/src/option/k3bdevicewidget.h
@@ -41,7 +41,7 @@ class TQLineEdit;
*/
class K3bDeviceWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/src/option/k3bexternalbinoptiontab.h b/src/option/k3bexternalbinoptiontab.h
index 651e040..d8e99a7 100644
--- a/src/option/k3bexternalbinoptiontab.h
+++ b/src/option/k3bexternalbinoptiontab.h
@@ -30,7 +30,7 @@ class K3bExternalBinWidget;
class K3bExternalBinOptionTab : public TQWidget
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/src/option/k3bexternalbinwidget.cpp b/src/option/k3bexternalbinwidget.cpp
index e79ac32..683c0f6 100644
--- a/src/option/k3bexternalbinwidget.cpp
+++ b/src/option/k3bexternalbinwidget.cpp
@@ -184,9 +184,9 @@ K3bExternalBinWidget::K3bExternalBinWidget( K3bExternalBinManager* manager, TQWi
m_programRootItems.setAutoDelete( true );
- connect( m_rescanButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(rescan()) );
- connect( m_defaultButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSetDefaultButtonClicked()) );
- connect( m_programView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotProgramSelectionChanged(TQListViewItem*)) );
+ connect( m_rescanButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(rescan()) );
+ connect( m_defaultButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSetDefaultButtonClicked()) );
+ connect( m_programView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(slotProgramSelectionChanged(TQListViewItem*)) );
slotProgramSelectionChanged( 0 );
}
diff --git a/src/option/k3bexternalbinwidget.h b/src/option/k3bexternalbinwidget.h
index 142c82a..f0d4272 100644
--- a/src/option/k3bexternalbinwidget.h
+++ b/src/option/k3bexternalbinwidget.h
@@ -34,7 +34,7 @@ class K3bExternalBin;
class K3bExternalBinWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/src/option/k3bmiscoptiontab.cpp b/src/option/k3bmiscoptiontab.cpp
index 7176364..a24512a 100644
--- a/src/option/k3bmiscoptiontab.cpp
+++ b/src/option/k3bmiscoptiontab.cpp
@@ -42,8 +42,8 @@ K3bMiscOptionTab::K3bMiscOptionTab(TQWidget *parent, const char *name )
: base_K3bMiscOptionTab(parent,name)
{
m_editTempDir->setMode( KFile::Directory );
- connect( m_buttonConfigureAudioOutput, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotConfigureAudioOutput()) );
+ connect( m_buttonConfigureAudioOutput, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotConfigureAudioOutput()) );
m_comboActionDialogSettings->insertItem( K3bInteractionDialog::LOAD_K3B_DEFAULTS,
i18n("Default Settings"),
diff --git a/src/option/k3bmiscoptiontab.h b/src/option/k3bmiscoptiontab.h
index aa213ab..d1ec855 100644
--- a/src/option/k3bmiscoptiontab.h
+++ b/src/option/k3bmiscoptiontab.h
@@ -27,7 +27,7 @@ class KURLRequester;
*/
class K3bMiscOptionTab : public base_K3bMiscOptionTab
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/src/option/k3bnotifyoptiontab.h b/src/option/k3bnotifyoptiontab.h
index e00c08f..81f660b 100644
--- a/src/option/k3bnotifyoptiontab.h
+++ b/src/option/k3bnotifyoptiontab.h
@@ -27,7 +27,7 @@ namespace KNotify {
class K3bNotifyOptionTab : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/src/option/k3boptiondialog.cpp b/src/option/k3boptiondialog.cpp
index 9e4fb01..50a43d6 100644
--- a/src/option/k3boptiondialog.cpp
+++ b/src/option/k3boptiondialog.cpp
@@ -127,7 +127,7 @@ void K3bOptionDialog::slotDefault()
void K3bOptionDialog::setupBurningPage()
{
TQFrame* frame = addPage( i18n("Advanced"), i18n("Advanced Settings"),
- TDEGlobal::instance()->iconLoader()->loadIcon( "media-optical-cdwriter", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
+ TDEGlobal::instance()->iconLoader()->loadIcon( "cd-rw-unmounted", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
TQGridLayout* _frameLayout = new TQGridLayout( frame );
_frameLayout->setSpacing( 0 );
diff --git a/src/option/k3boptiondialog.h b/src/option/k3boptiondialog.h
index 174838d..748c3d6 100644
--- a/src/option/k3boptiondialog.h
+++ b/src/option/k3boptiondialog.h
@@ -34,7 +34,7 @@ class K3bThemeOptionTab;
*/
class K3bOptionDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/src/option/k3bpluginoptiontab.cpp b/src/option/k3bpluginoptiontab.cpp
index 8f214ee..e9ee61b 100644
--- a/src/option/k3bpluginoptiontab.cpp
+++ b/src/option/k3bpluginoptiontab.cpp
@@ -72,9 +72,9 @@ K3bPluginOptionTab::K3bPluginOptionTab( TQWidget* parent, const char* name )
m_viewPlugins->setAlternateBackground( TQColor() );
m_viewPlugins->setAllColumnsShowFocus(true);
- connect( m_viewPlugins, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(slotConfigureButtonClicked()) );
- connect( m_buttonConfigure, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConfigureButtonClicked()) );
- connect( m_viewPlugins, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) );
+ connect( m_viewPlugins, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQ_SLOT(slotConfigureButtonClicked()) );
+ connect( m_buttonConfigure, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotConfigureButtonClicked()) );
+ connect( m_viewPlugins, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()) );
}
diff --git a/src/option/k3bpluginoptiontab.h b/src/option/k3bpluginoptiontab.h
index f3c6123..1bc6128 100644
--- a/src/option/k3bpluginoptiontab.h
+++ b/src/option/k3bpluginoptiontab.h
@@ -22,7 +22,7 @@
class K3bPluginOptionTab : public base_K3bPluginOptionTab
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/src/option/k3bthemeoptiontab.cpp b/src/option/k3bthemeoptiontab.cpp
index adb27f4..dd4b269 100644
--- a/src/option/k3bthemeoptiontab.cpp
+++ b/src/option/k3bthemeoptiontab.cpp
@@ -67,14 +67,14 @@ K3bThemeOptionTab::K3bThemeOptionTab(TQWidget *parent, const char *name )
m_viewTheme->setShadeSortColumn( false );
#endif
- connect( m_viewTheme, TQT_SIGNAL(selectionChanged()),
- this, TQT_SLOT(selectionChanged()) );
- connect( kapp, TQT_SIGNAL(appearanceChanged()),
- this, TQT_SLOT(selectionChanged()) );
- connect( m_buttonInstallTheme, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotInstallTheme()) );
- connect( m_buttonRemoveTheme, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotRemoveTheme()) );
+ connect( m_viewTheme, TQ_SIGNAL(selectionChanged()),
+ this, TQ_SLOT(selectionChanged()) );
+ connect( kapp, TQ_SIGNAL(appearanceChanged()),
+ this, TQ_SLOT(selectionChanged()) );
+ connect( m_buttonInstallTheme, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotInstallTheme()) );
+ connect( m_buttonRemoveTheme, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotRemoveTheme()) );
}
diff --git a/src/option/k3bthemeoptiontab.h b/src/option/k3bthemeoptiontab.h
index 3fa258e..003bdd2 100644
--- a/src/option/k3bthemeoptiontab.h
+++ b/src/option/k3bthemeoptiontab.h
@@ -25,7 +25,7 @@
*/
class K3bThemeOptionTab : public base_K3bThemeOptionTab
{
- Q_OBJECT
+ TQ_OBJECT
public: