summaryrefslogtreecommitdiffstats
path: root/src/gui/dialogs
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/dialogs')
-rw-r--r--src/gui/dialogs/AudioManagerDialog.cpp8
-rw-r--r--src/gui/dialogs/AudioPluginDialog.cpp2
-rw-r--r--src/gui/dialogs/ConfigureDialog.cpp8
-rw-r--r--src/gui/dialogs/ConfigureDialogBase.cpp2
-rw-r--r--src/gui/dialogs/DocumentConfigureDialog.cpp6
-rw-r--r--src/gui/dialogs/EventEditDialog.cpp30
-rw-r--r--src/gui/dialogs/IdentifyTextCodecDialog.cpp2
-rw-r--r--src/gui/dialogs/KeySignatureDialog.cpp2
-rw-r--r--src/gui/dialogs/TimeSignatureDialog.cpp2
-rw-r--r--src/gui/dialogs/TransportDialog.cpp6
10 files changed, 34 insertions, 34 deletions
diff --git a/src/gui/dialogs/AudioManagerDialog.cpp b/src/gui/dialogs/AudioManagerDialog.cpp
index b2a2142..0c38cc2 100644
--- a/src/gui/dialogs/AudioManagerDialog.cpp
+++ b/src/gui/dialogs/AudioManagerDialog.cpp
@@ -882,7 +882,7 @@ AudioManagerDialog::slotDeleteUnused()
}
for (int i = 0; i < names.size(); ++i) {
- std::cerr << i << ": " << names[i] << std::endl;
+ std::cerr << i << ": " << names[i].ascii() << std::endl;
TQFile file(names[i]);
if (!file.remove()) {
KMessageBox::error(this, i18n("File %1 could not be deleted.").tqarg(names[i]));
@@ -891,7 +891,7 @@ AudioManagerDialog::slotDeleteUnused()
m_doc->getAudioFileManager().removeFile(nameMap[names[i]]);
emit deleteAudioFile(nameMap[names[i]]);
} else {
- std::cerr << "WARNING: Audio file name " << names[i] << " not in name map" << std::endl;
+ std::cerr << "WARNING: Audio file name " << names[i].ascii() << " not in name map" << std::endl;
}
TQFile peakFile(TQString("%1.pk").tqarg(names[i]));
@@ -1150,7 +1150,7 @@ AudioManagerDialog::slotDropped(TQDropEvent *event, TQListViewItem*)
// see if we can decode a URI.. if not, just ignore it
if (TQUriDrag::decode(event, uri)) {
// okay, we have a URI.. process it
- for (TQString url = uri.first(); url; url = uri.next()) {
+ for (TQString url = uri.first(); !url.isNull(); url = uri.next()) {
RG_DEBUG << "AudioManagerDialog::dropEvent() : got "
<< url << endl;
@@ -1222,7 +1222,7 @@ AudioManagerDialog::slotDistributeOnMidiSegment()
//Composition &comp = m_doc->getComposition();
- TQList<RosegardenGUIView>& viewList = m_doc->getViewList();
+ TQPtrList<RosegardenGUIView>& viewList = m_doc->getViewList();
RosegardenGUIView *w = 0;
SegmentSelection selection;
diff --git a/src/gui/dialogs/AudioPluginDialog.cpp b/src/gui/dialogs/AudioPluginDialog.cpp
index e3a32a2..97b4e7f 100644
--- a/src/gui/dialogs/AudioPluginDialog.cpp
+++ b/src/gui/dialogs/AudioPluginDialog.cpp
@@ -281,7 +281,7 @@ AudioPluginDialog::populatePluginList()
if (needCategory) {
TQString cat = "";
- if ((*i)->getCategory())
+ if (!((*i)->getCategory()).isNull())
cat = (*i)->getCategory();
if (cat != category)
continue;
diff --git a/src/gui/dialogs/ConfigureDialog.cpp b/src/gui/dialogs/ConfigureDialog.cpp
index 9d07860..c8e7341 100644
--- a/src/gui/dialogs/ConfigureDialog.cpp
+++ b/src/gui/dialogs/ConfigureDialog.cpp
@@ -73,7 +73,7 @@ ConfigureDialog::ConfigureDialog(RosegardenGUIDoc *doc,
//
pageWidget = addPage(GeneralConfigurationPage::iconLabel(),
GeneralConfigurationPage::title(),
- loadIcon(GeneralConfigurationPage::iconName()));
+ loadIcon(GeneralConfigurationPage::iconName().ascii()));
vlay = new TQVBoxLayout(pageWidget, 0, spacingHint());
page = new GeneralConfigurationPage(doc, cfg, pageWidget);
vlay->addWidget(page);
@@ -87,7 +87,7 @@ ConfigureDialog::ConfigureDialog(RosegardenGUIDoc *doc,
pageWidget = addPage(MIDIConfigurationPage::iconLabel(),
MIDIConfigurationPage::title(),
- loadIcon(MIDIConfigurationPage::iconName()));
+ loadIcon(MIDIConfigurationPage::iconName().ascii()));
vlay = new TQVBoxLayout(pageWidget, 0, spacingHint());
page = new MIDIConfigurationPage(doc, cfg, pageWidget);
vlay->addWidget(page);
@@ -96,7 +96,7 @@ ConfigureDialog::ConfigureDialog(RosegardenGUIDoc *doc,
pageWidget = addPage(AudioConfigurationPage::iconLabel(),
AudioConfigurationPage::title(),
- loadIcon(AudioConfigurationPage::iconName()));
+ loadIcon(AudioConfigurationPage::iconName().ascii()));
vlay = new TQVBoxLayout(pageWidget, 0, spacingHint());
page = new AudioConfigurationPage(doc, cfg, pageWidget);
vlay->addWidget(page);
@@ -106,7 +106,7 @@ ConfigureDialog::ConfigureDialog(RosegardenGUIDoc *doc,
// Notation Page
pageWidget = addPage(NotationConfigurationPage::iconLabel(),
NotationConfigurationPage::title(),
- loadIcon(NotationConfigurationPage::iconName()));
+ loadIcon(NotationConfigurationPage::iconName().ascii()));
vlay = new TQVBoxLayout(pageWidget, 0, spacingHint());
page = new NotationConfigurationPage(cfg, pageWidget);
vlay->addWidget(page);
diff --git a/src/gui/dialogs/ConfigureDialogBase.cpp b/src/gui/dialogs/ConfigureDialogBase.cpp
index 017e6a6..3102922 100644
--- a/src/gui/dialogs/ConfigureDialogBase.cpp
+++ b/src/gui/dialogs/ConfigureDialogBase.cpp
@@ -38,7 +38,7 @@ namespace Rosegarden
ConfigureDialogBase::ConfigureDialogBase(TQWidget *parent,
TQString label,
const char *name):
- KDialogBase(IconList, label ? label : i18n("Configure"), Help | Apply | Ok | Cancel,
+ KDialogBase(IconList, (!label.isNull()) ? label : i18n("Configure"), Help | Apply | Ok | Cancel,
Ok, parent, name, true) // modal
{
setWFlags(WDestructiveClose);
diff --git a/src/gui/dialogs/DocumentConfigureDialog.cpp b/src/gui/dialogs/DocumentConfigureDialog.cpp
index ff855d7..06165e1 100644
--- a/src/gui/dialogs/DocumentConfigureDialog.cpp
+++ b/src/gui/dialogs/DocumentConfigureDialog.cpp
@@ -71,7 +71,7 @@ DocumentConfigureDialog::DocumentConfigureDialog(RosegardenGUIDoc *doc,
//
pageWidget = addPage(DocumentMetaConfigurationPage::iconLabel(),
DocumentMetaConfigurationPage::title(),
- loadIcon(DocumentMetaConfigurationPage::iconName()));
+ loadIcon(DocumentMetaConfigurationPage::iconName().ascii()));
vlay = new TQVBoxLayout(pageWidget, 0, spacingHint());
page = new DocumentMetaConfigurationPage(doc, pageWidget);
vlay->addWidget(page);
@@ -82,7 +82,7 @@ DocumentConfigureDialog::DocumentConfigureDialog(RosegardenGUIDoc *doc,
//
pageWidget = addPage(AudioPropertiesPage::iconLabel(),
AudioPropertiesPage::title(),
- loadIcon(AudioPropertiesPage::iconName()));
+ loadIcon(AudioPropertiesPage::iconName().ascii()));
vlay = new TQVBoxLayout(pageWidget, 0, spacingHint());
page = new AudioPropertiesPage(doc, pageWidget);
vlay->addWidget(page);
@@ -92,7 +92,7 @@ DocumentConfigureDialog::DocumentConfigureDialog(RosegardenGUIDoc *doc,
// Colour Page
pageWidget = addPage(ColourConfigurationPage::iconLabel(),
ColourConfigurationPage::title(),
- loadIcon(ColourConfigurationPage::iconName()));
+ loadIcon(ColourConfigurationPage::iconName().ascii()));
vlay = new TQVBoxLayout(pageWidget, 0, spacingHint());
page = new ColourConfigurationPage(doc, pageWidget);
diff --git a/src/gui/dialogs/EventEditDialog.cpp b/src/gui/dialogs/EventEditDialog.cpp
index 0502fce..6bd4752 100644
--- a/src/gui/dialogs/EventEditDialog.cpp
+++ b/src/gui/dialogs/EventEditDialog.cpp
@@ -179,10 +179,10 @@ EventEditDialog::EventEditDialog(TQWidget *parent,
for (Event::PropertyNames::iterator i = p.begin();
i != p.end(); ++i) {
- new TQLabel(strtoqstr(*i), m_nonPersistentGrid, strtoqstr(*i));
- new TQLabel(strtoqstr(event.getPropertyTypeAsString(*i)), m_nonPersistentGrid, strtoqstr(*i));
- new TQLabel(strtoqstr(event.getAsString(*i)), m_nonPersistentGrid, strtoqstr(*i));
- TQPushButton *button = new TQPushButton("P", m_nonPersistentGrid, strtoqstr(*i));
+ new TQLabel(strtoqstr(*i), m_nonPersistentGrid, strtoqstr(*i).ascii());
+ new TQLabel(strtoqstr(event.getPropertyTypeAsString(*i)), m_nonPersistentGrid, strtoqstr(*i).ascii());
+ new TQLabel(strtoqstr(event.getAsString(*i)), m_nonPersistentGrid, strtoqstr(*i).ascii());
+ TQPushButton *button = new TQPushButton("P", m_nonPersistentGrid, strtoqstr(*i).ascii());
button->setFixedSize(TQSize(24, 24));
TQToolTip::add
(button, i18n("Make persistent"));
@@ -195,10 +195,10 @@ EventEditDialog::EventEditDialog(TQWidget *parent,
void
EventEditDialog::addPersistentProperty(const PropertyName &name)
{
- TQLabel *label = new TQLabel(strtoqstr(name), m_persistentGrid, strtoqstr(name));
+ TQLabel *label = new TQLabel(strtoqstr(name), m_persistentGrid, strtoqstr(name).ascii());
label->show();
label = new TQLabel(strtoqstr(m_originalEvent.getPropertyTypeAsString(name)),
- m_persistentGrid, strtoqstr(name));
+ m_persistentGrid, strtoqstr(name).ascii());
label->show();
PropertyType type(m_originalEvent.getPropertyType(name));
@@ -213,7 +213,7 @@ EventEditDialog::addPersistentProperty(const PropertyName &name)
max = 127;
}
TQSpinBox *spinBox = new TQSpinBox
- (min, max, 1, m_persistentGrid, strtoqstr(name));
+ (min, max, 1, m_persistentGrid, strtoqstr(name).ascii());
spinBox->setValue(m_originalEvent.get<Int>(name));
TQObject::connect(spinBox, TQT_SIGNAL(valueChanged(int)),
this, TQT_SLOT(slotIntPropertyChanged(int)));
@@ -228,7 +228,7 @@ case UInt: {
max = 65535;
}
TQSpinBox *spinBox = new TQSpinBox
- (min, max, 1, m_persistentGrid, strtoqstr(name));
+ (min, max, 1, m_persistentGrid, strtoqstr(name).ascii());
spinBox->setValue(m_originalEvent.get<UInt>(name));
TQObject::connect(spinBox, TQT_SIGNAL(valueChanged(int)),
this, TQT_SLOT(slotIntPropertyChanged(int)));
@@ -244,7 +244,7 @@ case UInt: {
//
TQSpinBox *spinBox = new TQSpinBox
(INT_MIN, INT_MAX, 1,
- hbox, strtoqstr(name) + "%sec");
+ hbox, TQString(strtoqstr(name) + "%sec").ascii());
spinBox->setValue(realTime.sec);
TQObject::connect(spinBox, TQT_SIGNAL(valueChanged(int)),
@@ -254,7 +254,7 @@ case UInt: {
//
spinBox = new TQSpinBox
(INT_MIN, INT_MAX, 1,
- hbox, strtoqstr(name) + "%nsec");
+ hbox, TQString(strtoqstr(name) + "%nsec").ascii());
spinBox->setValue(realTime.nsec);
TQObject::connect(spinBox, TQT_SIGNAL(valueChanged(int)),
@@ -265,7 +265,7 @@ case UInt: {
case Bool: {
TQCheckBox *checkBox = new TQCheckBox
- ("", m_persistentGrid, strtoqstr(name));
+ ("", m_persistentGrid, strtoqstr(name).ascii());
checkBox->setChecked(m_originalEvent.get<Bool>(name));
TQObject::connect(checkBox, TQT_SIGNAL(activated()),
this, TQT_SLOT(slotBoolPropertyChanged()));
@@ -277,7 +277,7 @@ case UInt: {
TQLineEdit *lineEdit = new TQLineEdit
(strtoqstr(m_originalEvent.get<String>(name)),
m_persistentGrid,
- strtoqstr(name));
+ strtoqstr(name).ascii());
TQObject::connect(lineEdit, TQT_SIGNAL(textChanged(const TQString &)),
this, TQT_SLOT(slotStringPropertyChanged(const TQString &)));
lineEdit->show();
@@ -286,7 +286,7 @@ case UInt: {
}
TQPushButton *button = new TQPushButton("X", m_persistentGrid,
- strtoqstr(name));
+ strtoqstr(name).ascii());
button->setFixedSize(TQSize(24, 24));
TQToolTip::add
(button, i18n("Delete this property"));
@@ -438,7 +438,7 @@ EventEditDialog::slotPropertyDeleted()
return ;
m_modified = true;
- TQObjectList *list = m_persistentGrid->queryList(0, propertyName, false);
+ TQObjectList *list = m_persistentGrid->queryList(0, propertyName.ascii(), false);
TQObjectListIt i(*list);
TQObject *obj;
while ((obj = i.current()) != 0) {
@@ -470,7 +470,7 @@ EventEditDialog::slotPropertyMadePersistent()
i18n("Make &Persistent")) != KMessageBox::Continue)
return ;
- TQObjectList *list = m_nonPersistentGrid->queryList(0, propertyName, false);
+ TQObjectList *list = m_nonPersistentGrid->queryList(0, propertyName.ascii(), false);
TQObjectListIt i(*list);
TQObject *obj;
while ((obj = i.current()) != 0) {
diff --git a/src/gui/dialogs/IdentifyTextCodecDialog.cpp b/src/gui/dialogs/IdentifyTextCodecDialog.cpp
index 0a0dbd1..a3d905d 100644
--- a/src/gui/dialogs/IdentifyTextCodecDialog.cpp
+++ b/src/gui/dialogs/IdentifyTextCodecDialog.cpp
@@ -160,7 +160,7 @@ IdentifyTextCodecDialog::slotCodecSelected(int i)
// std::cerr << "codecs: ";
// for (int j = 0; j < m_codecs.size(); ++j) std::cerr << m_codecs[j] << " ";
// std::cerr << std::endl;
- TQTextCodec *codec = TQTextCodec::codecForName(strtoqstr(name));
+ TQTextCodec *codec = TQTextCodec::codecForName(strtoqstr(name).ascii());
if (!codec) return;
m_codec = qstrtostr(codec->name());
std::cerr << "Applying codec " << m_codec << std::endl;
diff --git a/src/gui/dialogs/KeySignatureDialog.cpp b/src/gui/dialogs/KeySignatureDialog.cpp
index 79f190c..a5e829d 100644
--- a/src/gui/dialogs/KeySignatureDialog.cpp
+++ b/src/gui/dialogs/KeySignatureDialog.cpp
@@ -89,7 +89,7 @@ KeySignatureDialog::KeySignatureDialog(TQWidget *parent,
nameBox = new TQHBox(keyFrame);
TQLabel *explanatoryLabel = 0;
- if (explanatoryText) {
+ if (!explanatoryText.isNull()) {
explanatoryLabel = new TQLabel(explanatoryText, keyFrame);
}
diff --git a/src/gui/dialogs/TimeSignatureDialog.cpp b/src/gui/dialogs/TimeSignatureDialog.cpp
index eae6501..7aae2aa 100644
--- a/src/gui/dialogs/TimeSignatureDialog.cpp
+++ b/src/gui/dialogs/TimeSignatureDialog.cpp
@@ -84,7 +84,7 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent,
TQHBox *denomBox = new TQHBox(groupBox);
TQLabel *explanatoryLabel = 0;
- if (explanatoryText) {
+ if (!explanatoryText.isNull()) {
explanatoryLabel = new TQLabel(explanatoryText, groupBox);
}
diff --git a/src/gui/dialogs/TransportDialog.cpp b/src/gui/dialogs/TransportDialog.cpp
index d4c94a9..68c42a7 100644
--- a/src/gui/dialogs/TransportDialog.cpp
+++ b/src/gui/dialogs/TransportDialog.cpp
@@ -347,7 +347,7 @@ TransportDialog::loadPixmaps()
fileName = TQString("%1/transport/led-%2.xpm").tqarg(pixmapDir).tqarg(i);
if (!m_lcdList[i].load(fileName)) {
std::cerr << "TransportDialog - failed to load pixmap \""
- << fileName << "\"" << std::endl;
+ << fileName.ascii() << "\"" << std::endl;
}
}
@@ -959,7 +959,7 @@ TransportDialog::setMidiInLabel(const MappedEvent *mE)
void
TransportDialog::slotClearMidiInLabel()
{
- m_transport->InDisplay->setText(i18n(TQString("NO EVENTS")));
+ m_transport->InDisplay->setText(i18n(TQString("NO EVENTS").ascii()));
// also, just to be sure:
slotResetBackground();
@@ -1019,7 +1019,7 @@ TransportDialog::setMidiOutLabel(const MappedEvent *mE)
void
TransportDialog::slotClearMidiOutLabel()
{
- m_transport->OutDisplay->setText(i18n(TQString("NO EVENTS")));
+ m_transport->OutDisplay->setText(i18n(TQString("NO EVENTS").ascii()));
}
void
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-23 08:22:48 +0000