summaryrefslogtreecommitdiffstats
path: root/kradio3/src
diff options
context:
space:
mode:
Diffstat (limited to 'kradio3/src')
-rw-r--r--kradio3/src/aboutwidget.cpp2
-rw-r--r--kradio3/src/frequencyseekhelper.cpp4
-rw-r--r--kradio3/src/include/aboutwidget.h4
-rw-r--r--kradio3/src/include/frequencyseekhelper.h2
-rw-r--r--kradio3/src/include/plugin_configuration_dialog.h2
-rw-r--r--kradio3/src/include/pluginmanager-configuration.h2
-rw-r--r--kradio3/src/include/radiostation-config.h6
-rw-r--r--kradio3/src/include/radiostation-listview.h2
-rw-r--r--kradio3/src/include/seekhelper.h2
-rw-r--r--kradio3/src/include/standardscandialog.h2
-rw-r--r--kradio3/src/include/stationselector.h2
-rw-r--r--kradio3/src/plugin_configuration_dialog.cpp4
-rw-r--r--kradio3/src/pluginmanager-configuration.cpp4
-rw-r--r--kradio3/src/pluginmanager.cpp4
-rw-r--r--kradio3/src/radiostation-config.cpp12
-rw-r--r--kradio3/src/radiostation-listview.cpp4
-rw-r--r--kradio3/src/seekhelper.cpp4
-rw-r--r--kradio3/src/soundformat.cpp44
-rw-r--r--kradio3/src/standardscandialog.cpp4
-rw-r--r--kradio3/src/stationselector.cpp4
20 files changed, 57 insertions, 57 deletions
diff --git a/kradio3/src/aboutwidget.cpp b/kradio3/src/aboutwidget.cpp
index 4c72cd0..323dfef 100644
--- a/kradio3/src/aboutwidget.cpp
+++ b/kradio3/src/aboutwidget.cpp
@@ -44,7 +44,7 @@
class KRadioAboutTabWidget : public TQTabWidget
{
public:
- KRadioAboutTabWidget( TQWidget* tqparent ) : TQTabWidget( tqparent ) {}
+ KRadioAboutTabWidget( TQWidget* parent ) : TQTabWidget( parent ) {}
TQSize tqsizeHint() const {
return TQTabWidget::tqsizeHint().expandedTo( tabBar()->tqsizeHint() + TQSize(4,4) );
}
diff --git a/kradio3/src/frequencyseekhelper.cpp b/kradio3/src/frequencyseekhelper.cpp
index 84a2bc9..1c24329 100644
--- a/kradio3/src/frequencyseekhelper.cpp
+++ b/kradio3/src/frequencyseekhelper.cpp
@@ -18,8 +18,8 @@
#include "include/frequencyseekhelper.h"
#include <tqtimer.h>
-FrequencySeekHelper::FrequencySeekHelper(ISeekRadio &tqparent)
- : SeekHelper(tqparent)
+FrequencySeekHelper::FrequencySeekHelper(ISeekRadio &parent)
+ : SeekHelper(parent)
{
m_timer = new TQTimer(this);
TQObject::connect (m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(step()));
diff --git a/kradio3/src/include/aboutwidget.h b/kradio3/src/include/aboutwidget.h
index 9faf570..58d9389 100644
--- a/kradio3/src/include/aboutwidget.h
+++ b/kradio3/src/include/aboutwidget.h
@@ -56,7 +56,7 @@ class KRadioImageTrackLabel : public TQLabel
};
public:
- KRadioImageTrackLabel( TQWidget * tqparent, const char * name=0, WFlags f=0 );
+ KRadioImageTrackLabel( TQWidget * parent, const char * name=0, WFlags f=0 );
signals:
void mouseTrack( int mode, const TQMouseEvent *e );
@@ -92,7 +92,7 @@ class KRadioAboutWidget : public TQWidget
};
public:
- KRadioAboutWidget(const KAboutData &abtData, int layoutType, TQWidget *tqparent = 0, char *name = 0);
+ KRadioAboutWidget(const KAboutData &abtData, int layoutType, TQWidget *parent = 0, char *name = 0);
virtual void show( void );
virtual TQSize tqsizeHint( void ) const;
diff --git a/kradio3/src/include/frequencyseekhelper.h b/kradio3/src/include/frequencyseekhelper.h
index 3401b95..8dedff9 100644
--- a/kradio3/src/include/frequencyseekhelper.h
+++ b/kradio3/src/include/frequencyseekhelper.h
@@ -34,7 +34,7 @@ Q_OBJECT
TQ_OBJECT
public:
- FrequencySeekHelper(ISeekRadio &tqparent);
+ FrequencySeekHelper(ISeekRadio &parent);
virtual ~FrequencySeekHelper();
// IFrequencyRadioClient
diff --git a/kradio3/src/include/plugin_configuration_dialog.h b/kradio3/src/include/plugin_configuration_dialog.h
index 87e4d35..cdc7432 100644
--- a/kradio3/src/include/plugin_configuration_dialog.h
+++ b/kradio3/src/include/plugin_configuration_dialog.h
@@ -35,7 +35,7 @@ public:
PluginConfigurationDialog(
int dialogFace, const TQString &caption,
int buttonMask, ButtonCode defaultButton,
- TQWidget *tqparent=0, const char *name=0,
+ TQWidget *parent=0, const char *name=0,
bool modal=true, bool separator=false);
// PluginBase
diff --git a/kradio3/src/include/pluginmanager-configuration.h b/kradio3/src/include/pluginmanager-configuration.h
index 77c28dd..d07e257 100644
--- a/kradio3/src/include/pluginmanager-configuration.h
+++ b/kradio3/src/include/pluginmanager-configuration.h
@@ -33,7 +33,7 @@ class PluginManagerConfiguration : public PluginManagerConfigurationUI
Q_OBJECT
TQ_OBJECT
public :
- PluginManagerConfiguration (TQWidget *tqparent, KRadioApp *app, PluginManager *pm);
+ PluginManagerConfiguration (TQWidget *parent, KRadioApp *app, PluginManager *pm);
~PluginManagerConfiguration ();
void noticePluginLibrariesChanged();
diff --git a/kradio3/src/include/radiostation-config.h b/kradio3/src/include/radiostation-config.h
index 17ee824..671e328 100644
--- a/kradio3/src/include/radiostation-config.h
+++ b/kradio3/src/include/radiostation-config.h
@@ -31,7 +31,7 @@ class RadioStationConfig : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- RadioStationConfig(TQWidget *tqparent);
+ RadioStationConfig(TQWidget *parent);
~RadioStationConfig();
virtual void setStationData (const RadioStation &rs) = 0;
@@ -47,7 +47,7 @@ class UndefinedRadioStationConfig : public RadioStationConfig
Q_OBJECT
TQ_OBJECT
public:
- UndefinedRadioStationConfig (TQWidget *tqparent);
+ UndefinedRadioStationConfig (TQWidget *parent);
~UndefinedRadioStationConfig();
virtual void setStationData (const RadioStation &rs);
@@ -63,7 +63,7 @@ class FrequencyRadioStationConfig : public RadioStationConfig
Q_OBJECT
TQ_OBJECT
public:
- FrequencyRadioStationConfig (TQWidget *tqparent);
+ FrequencyRadioStationConfig (TQWidget *parent);
~FrequencyRadioStationConfig();
virtual void setStationData (const RadioStation &rs);
diff --git a/kradio3/src/include/radiostation-listview.h b/kradio3/src/include/radiostation-listview.h
index 43bf535..75143a4 100644
--- a/kradio3/src/include/radiostation-listview.h
+++ b/kradio3/src/include/radiostation-listview.h
@@ -33,7 +33,7 @@ class RadioStationListView : public KListView
Q_OBJECT
TQ_OBJECT
public:
- RadioStationListView(TQWidget *tqparent=0, const char *name=0);
+ RadioStationListView(TQWidget *parent=0, const char *name=0);
virtual ~RadioStationListView();
TQListViewItem *getItemForIndex(int idx) const;
diff --git a/kradio3/src/include/seekhelper.h b/kradio3/src/include/seekhelper.h
index 8baa9a0..f61ad9d 100644
--- a/kradio3/src/include/seekhelper.h
+++ b/kradio3/src/include/seekhelper.h
@@ -33,7 +33,7 @@ public:
typedef enum { off, searchWorse, searchBest } state_t;
typedef enum { up, down } direction_t;
- SeekHelper(ISeekRadio &tqparent);
+ SeekHelper(ISeekRadio &parent);
virtual ~SeekHelper();
virtual bool connectI (Interface *i);
diff --git a/kradio3/src/include/standardscandialog.h b/kradio3/src/include/standardscandialog.h
index bab8bf1..1b83933 100644
--- a/kradio3/src/include/standardscandialog.h
+++ b/kradio3/src/include/standardscandialog.h
@@ -38,7 +38,7 @@ class StandardScanDialog : public StandardScanDialogUI,
Q_OBJECT
TQ_OBJECT
public:
- StandardScanDialog(TQWidget *tqparent);
+ StandardScanDialog(TQWidget *parent);
~StandardScanDialog();
bool connectI (Interface *i);
diff --git a/kradio3/src/include/stationselector.h b/kradio3/src/include/stationselector.h
index 432b870..cc3186d 100644
--- a/kradio3/src/include/stationselector.h
+++ b/kradio3/src/include/stationselector.h
@@ -41,7 +41,7 @@ class StationSelector : public StationSelectorUI,
Q_OBJECT
TQ_OBJECT
public :
- StationSelector (TQWidget *tqparent);
+ StationSelector (TQWidget *parent);
~StationSelector ();
bool connectI (Interface *i);
diff --git a/kradio3/src/plugin_configuration_dialog.cpp b/kradio3/src/plugin_configuration_dialog.cpp
index a20edfd..3482bf3 100644
--- a/kradio3/src/plugin_configuration_dialog.cpp
+++ b/kradio3/src/plugin_configuration_dialog.cpp
@@ -22,10 +22,10 @@
PluginConfigurationDialog::PluginConfigurationDialog(
int dialogFace, const TQString &caption,
int buttonMask, ButtonCode defaultButton,
- TQWidget *tqparent, const char *name,
+ TQWidget *parent, const char *name,
bool modal, bool separator)
: KDialogBase(dialogFace, caption, buttonMask, defaultButton,
- tqparent, name, modal, separator),
+ parent, name, modal, separator),
WidgetPluginBase (name, i18n("Configuration Dialog")),
m_Caption(caption)
{
diff --git a/kradio3/src/pluginmanager-configuration.cpp b/kradio3/src/pluginmanager-configuration.cpp
index afea368..72b0b00 100644
--- a/kradio3/src/pluginmanager-configuration.cpp
+++ b/kradio3/src/pluginmanager-configuration.cpp
@@ -28,8 +28,8 @@
#include <tqcheckbox.h>
-PluginManagerConfiguration::PluginManagerConfiguration(TQWidget *tqparent, KRadioApp *app, PluginManager *pm)
- : PluginManagerConfigurationUI(tqparent),
+PluginManagerConfiguration::PluginManagerConfiguration(TQWidget *parent, KRadioApp *app, PluginManager *pm)
+ : PluginManagerConfigurationUI(parent),
m_Application(app),
m_PluginManager(pm),
m_dirty(true)
diff --git a/kradio3/src/pluginmanager.cpp b/kradio3/src/pluginmanager.cpp
index 6576c84..6164f20 100644
--- a/kradio3/src/pluginmanager.cpp
+++ b/kradio3/src/pluginmanager.cpp
@@ -322,7 +322,7 @@ void PluginManager::createConfigDialog(const TQString &title)
title,
KDialogBase::Apply|KDialogBase::Ok|KDialogBase::Cancel,
KDialogBase::Ok,
- /*tqparent = */ NULL,
+ /*parent = */ NULL,
title.ascii(),
/*modal = */ false,
true);
@@ -398,7 +398,7 @@ void PluginManager::createAboutDialog(const TQString &title)
title,
KDialogBase::Close,
KDialogBase::Close,
- /*tqparent = */ NULL,
+ /*parent = */ NULL,
title.ascii(),
/*modal = */ false,
true);
diff --git a/kradio3/src/radiostation-config.cpp b/kradio3/src/radiostation-config.cpp
index 9f191c8..677d798 100644
--- a/kradio3/src/radiostation-config.cpp
+++ b/kradio3/src/radiostation-config.cpp
@@ -26,8 +26,8 @@
#include "include/frequencyradiostation.h"
-RadioStationConfig::RadioStationConfig(TQWidget *tqparent)
- : TQWidget (tqparent)
+RadioStationConfig::RadioStationConfig(TQWidget *parent)
+ : TQWidget (parent)
{
}
@@ -39,8 +39,8 @@ RadioStationConfig::~RadioStationConfig()
///////////////////////////////////////////////////////////////////////
-UndefinedRadioStationConfig::UndefinedRadioStationConfig (TQWidget *tqparent)
- : RadioStationConfig(tqparent)
+UndefinedRadioStationConfig::UndefinedRadioStationConfig (TQWidget *parent)
+ : RadioStationConfig(parent)
{
new TQLabel (i18n("I don't know how to edit this station"), this);
}
@@ -60,8 +60,8 @@ void UndefinedRadioStationConfig::storeStationData (RadioStation &/*rs*/)
///////////////////////////////////////////////////////////////////////
-FrequencyRadioStationConfig::FrequencyRadioStationConfig (TQWidget *tqparent)
- : RadioStationConfig(tqparent)
+FrequencyRadioStationConfig::FrequencyRadioStationConfig (TQWidget *parent)
+ : RadioStationConfig(parent)
{
TQHBoxLayout *hl = new TQHBoxLayout(this);
TQVBoxLayout *vl = new TQVBoxLayout(hl);
diff --git a/kradio3/src/radiostation-listview.cpp b/kradio3/src/radiostation-listview.cpp
index a9f814c..6502286 100644
--- a/kradio3/src/radiostation-listview.cpp
+++ b/kradio3/src/radiostation-listview.cpp
@@ -27,8 +27,8 @@
#include <kconfig.h>
-RadioStationListView::RadioStationListView(TQWidget *tqparent, const char *name)
- : KListView(tqparent, name)
+RadioStationListView::RadioStationListView(TQWidget *parent, const char *name)
+ : KListView(parent, name)
{
addColumn(i18n("No."));
addColumn(i18n("Icon"));
diff --git a/kradio3/src/seekhelper.cpp b/kradio3/src/seekhelper.cpp
index 6a26c5d..eab7c1a 100644
--- a/kradio3/src/seekhelper.cpp
+++ b/kradio3/src/seekhelper.cpp
@@ -19,9 +19,9 @@
#include <kdebug.h>
-SeekHelper::SeekHelper(ISeekRadio &tqparent)
+SeekHelper::SeekHelper(ISeekRadio &parent)
: m_state(off),
- m_parent(tqparent),
+ m_parent(parent),
m_SoundStreamID(SoundStreamID::InvalidID)
{
}
diff --git a/kradio3/src/soundformat.cpp b/kradio3/src/soundformat.cpp
index 9ca1b5d..50e0c75 100644
--- a/kradio3/src/soundformat.cpp
+++ b/kradio3/src/soundformat.cpp
@@ -87,15 +87,15 @@ int SoundFormat::convertSampleToInt(const char *sample, bool do_scale) const
}
int scale = (sizeof(unsigned) << 3) - m_SampleBits;
- int signtqmask = do_scale ? (!m_IsSigned << ((sizeof(unsigned) << 3) - 1)) :
+ int signmask = do_scale ? (!m_IsSigned << ((sizeof(unsigned) << 3) - 1)) :
(-m_IsSigned << ((size << 3) - 1)) ;
if (do_scale) {
// map to int number space
- return (val << scale) ^ signtqmask;
+ return (val << scale) ^ signmask;
} else {
// do only sign extension
- if (val & signtqmask)
- val |= signtqmask;
+ if (val & signmask)
+ val |= signmask;
return val;
}
}
@@ -105,9 +105,9 @@ void SoundFormat::convertIntToSample(int src, char *dst, bool is_scaled) const
{
int size = sampleSize();
int scale = (sizeof(unsigned) * 8) - m_SampleBits;
- int signtqmask = (!m_IsSigned << (sizeof(unsigned) * 8 - 1));
+ int signmask = (!m_IsSigned << (sizeof(unsigned) * 8 - 1));
- unsigned val = is_scaled ? (src ^ signtqmask) >> scale : src;
+ unsigned val = is_scaled ? (src ^ signmask) >> scale : src;
if (m_Endianess == LITTLE_ENDIAN) {
for (int i = 0; i < size; ++i, ++dst) {
(unsigned char &)*dst = val & 0xFF;
@@ -127,7 +127,7 @@ void SoundFormat::convertSamplesToInts(const char *src, int *dst, size_t n, bool
{
int size = sampleSize();
int scale = (sizeof(unsigned) * 8) - m_SampleBits;
- int signtqmask = do_scale ? (!m_IsSigned << ((sizeof(unsigned) << 3) - 1)) :
+ int signmask = do_scale ? (!m_IsSigned << ((sizeof(unsigned) << 3) - 1)) :
(-m_IsSigned << ((size << 3) - 1)) ;
if (m_Endianess == LITTLE_ENDIAN) {
src = src - 1 + (size * n);
@@ -138,9 +138,9 @@ void SoundFormat::convertSamplesToInts(const char *src, int *dst, size_t n, bool
val = (val << 8) | (unsigned char)*src;
}
if (do_scale) {
- *dst = (val << scale) ^ signtqmask;
- } else if (val & signtqmask) {
- *dst = val | signtqmask;
+ *dst = (val << scale) ^ signmask;
+ } else if (val & signmask) {
+ *dst = val | signmask;
}
}
} else {
@@ -150,9 +150,9 @@ void SoundFormat::convertSamplesToInts(const char *src, int *dst, size_t n, bool
val = (val << 8) | (unsigned char)*src;
}
if (do_scale) {
- *dst = (val << scale) ^ signtqmask;
- } else if (val & signtqmask) {
- *dst = val | signtqmask;
+ *dst = (val << scale) ^ signmask;
+ } else if (val & signmask) {
+ *dst = val | signmask;
}
}
}
@@ -163,11 +163,11 @@ void SoundFormat::convertIntsToSamples(const int *src, char *dst, size_t n, bool
{
int size = sampleSize();
int scale = (sizeof(unsigned) * 8) - m_SampleBits;
- int signtqmask = (!m_IsSigned << (sizeof(unsigned) * 8 - 1));
+ int signmask = (!m_IsSigned << (sizeof(unsigned) * 8 - 1));
if (m_Endianess == LITTLE_ENDIAN) {
for (const int *end = src+n; src < end; ++src) {
- unsigned val = is_scaled ? ((unsigned)(*src ^ signtqmask)) >> scale : *src;
+ unsigned val = is_scaled ? ((unsigned)(*src ^ signmask)) >> scale : *src;
for (int i = 0; i < size; ++i, ++dst) {
(unsigned char &)*dst = val & 0xFF;
val >>= 8;
@@ -177,7 +177,7 @@ void SoundFormat::convertIntsToSamples(const int *src, char *dst, size_t n, bool
dst = dst - 1 + (size * n);
const int *end = src;
for (src = src - 1 + n; src >= end; --src) {
- unsigned val = is_scaled ? ((unsigned)(*src ^ signtqmask)) >> scale : *src;
+ unsigned val = is_scaled ? ((unsigned)(*src ^ signmask)) >> scale : *src;
for (int i = size - 1; i >= 0; --i, --dst) {
(unsigned char &)*dst = val & 0xFF;
val >>= 8;
@@ -192,7 +192,7 @@ void SoundFormat::convertSamplesToFloat(const char *_src, float **_dst, size_t n
int sample_size = sampleSize();
int frame_size = frameSize();
int scale = (sizeof(short) << 3) - m_SampleBits;
- int signtqmask = !m_IsSigned << ((sizeof(short) << 3) - 1);
+ int signmask = !m_IsSigned << ((sizeof(short) << 3) - 1);
int skip = frame_size - sample_size;
if (m_Endianess == LITTLE_ENDIAN) {
@@ -206,7 +206,7 @@ void SoundFormat::convertSamplesToFloat(const char *_src, float **_dst, size_t n
for (int i = sample_size - 1; i >= 0; --i, --src) {
val = (val << 8) | (unsigned char)*src;
}
- *dst = (float)(signed short)((val << scale) ^ signtqmask) / 32768.0f;
+ *dst = (float)(signed short)((val << scale) ^ signmask) / 32768.0f;
src = src - skip;
}
}
@@ -219,7 +219,7 @@ void SoundFormat::convertSamplesToFloat(const char *_src, float **_dst, size_t n
for (int i = 0; i < sample_size; ++i, ++src) {
val = (val << 8) | (unsigned char)*src;
}
- *dst = (float)(signed short)((val << scale) ^ signtqmask) / 32768.0f;
+ *dst = (float)(signed short)((val << scale) ^ signmask) / 32768.0f;
src = src + skip;
}
}
@@ -233,7 +233,7 @@ void SoundFormat::convertFloatsToSamples(const float **_src, char *_dst, size_t
int sample_size = sampleSize();
int frame_size = frameSize();
int scale = (sizeof(short) << 3) - m_SampleBits;
- int signtqmask = (!m_IsSigned << (sizeof(short) << 3) - 1);
+ int signmask = (!m_IsSigned << (sizeof(short) << 3) - 1);
int skip = frame_size - sample_size;
if (m_Endianess == LITTLE_ENDIAN) {
@@ -241,7 +241,7 @@ void SoundFormat::convertFloatsToSamples(const float **_src, char *_dst, size_t
const float *src = _src[ch];
char *dst = _dst + ch * sample_size;
for (const float *end = src+n; src < end; ++src) {
- unsigned val = (( ((unsigned)(*src * 32768.0f)) ^ signtqmask)) >> scale;
+ unsigned val = (( ((unsigned)(*src * 32768.0f)) ^ signmask)) >> scale;
for (int i = 0; i < sample_size; ++i, ++dst) {
(unsigned char &)*dst = val & 0xFF;
val >>= 8;
@@ -256,7 +256,7 @@ void SoundFormat::convertFloatsToSamples(const float **_src, char *_dst, size_t
const float *src = _src[ch];
const float *end = src;
for (src = src - 1 + n; src >= end; --src) {
- unsigned val = (( ((unsigned)(*src * 32768.0f)) ^ signtqmask)) >> scale;
+ unsigned val = (( ((unsigned)(*src * 32768.0f)) ^ signmask)) >> scale;
for (int i = sample_size - 1; i >= 0; --i, --dst) {
(unsigned char &)*dst = val & 0xFF;
val >>= 8;
diff --git a/kradio3/src/standardscandialog.cpp b/kradio3/src/standardscandialog.cpp
index cccfac0..b96f794 100644
--- a/kradio3/src/standardscandialog.cpp
+++ b/kradio3/src/standardscandialog.cpp
@@ -26,8 +26,8 @@
#include <math.h>
-StandardScanDialog::StandardScanDialog(TQWidget *tqparent)
- : StandardScanDialogUI(tqparent, NULL, true),
+StandardScanDialog::StandardScanDialog(TQWidget *parent)
+ : StandardScanDialogUI(parent, NULL, true),
m_count(0),
m_running(false),
m_oldPowerOn(false),
diff --git a/kradio3/src/stationselector.cpp b/kradio3/src/stationselector.cpp
index 4f8456e..87a5d59 100644
--- a/kradio3/src/stationselector.cpp
+++ b/kradio3/src/stationselector.cpp
@@ -26,8 +26,8 @@ using namespace std;
#include "include/stationselector.h"
#include "include/radiostation-listview.h"
-StationSelector::StationSelector (TQWidget *tqparent)
- : StationSelectorUI(tqparent),
+StationSelector::StationSelector (TQWidget *parent)
+ : StationSelectorUI(parent),
m_dirty(true)
{
TQObject::connect(buttonToLeft, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotButtonToLeft()));
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-19 07:58:37 +0000