summaryrefslogtreecommitdiffstats
path: root/src/gui/editors
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/editors')
-rw-r--r--src/gui/editors/matrix/MatrixSelector.cpp4
-rw-r--r--src/gui/editors/notation/FontViewFrame.cpp6
-rw-r--r--src/gui/editors/notation/NotationEraser.cpp2
-rw-r--r--src/gui/editors/notation/NotationHLayout.cpp6
-rw-r--r--src/gui/editors/notation/NotationStaff.cpp6
-rw-r--r--src/gui/editors/notation/NotationStrings.cpp2
-rw-r--r--src/gui/editors/notation/NotationView.cpp4
-rw-r--r--src/gui/editors/notation/NoteFontFactory.cpp2
-rw-r--r--src/gui/editors/notation/NoteInserter.cpp2
-rw-r--r--src/gui/editors/notation/NotePixmapFactory.cpp4
-rw-r--r--src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp8
-rw-r--r--src/gui/editors/parameters/SegmentParameterBox.cpp2
-rw-r--r--src/gui/editors/parameters/TrackParameterBox.cpp4
-rw-r--r--src/gui/editors/segment/ControlEditorDialog.cpp4
-rw-r--r--src/gui/editors/segment/MarkerEditor.cpp22
-rw-r--r--src/gui/editors/segment/TrackEditor.cpp4
-rw-r--r--src/gui/editors/segment/TriggerSegmentManager.cpp22
-rw-r--r--src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp2
-rw-r--r--src/gui/editors/segment/segmentcanvas/CompositionView.cpp8
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp4
20 files changed, 59 insertions, 59 deletions
diff --git a/src/gui/editors/matrix/MatrixSelector.cpp b/src/gui/editors/matrix/MatrixSelector.cpp
index c084cd3..ffdc723 100644
--- a/src/gui/editors/matrix/MatrixSelector.cpp
+++ b/src/gui/editors/matrix/MatrixSelector.cpp
@@ -552,8 +552,8 @@ EventSelection* MatrixSelector::getSelection()
void MatrixSelector::setContextHelpFor(TQPoint p, bool ctrlPressed)
{
- kapp->config()->setGroup(GeneralOptionsConfigGroup);
- if (!kapp->config()->readBoolEntry("toolcontexthelp", true)) return;
+ tdeApp->config()->setGroup(GeneralOptionsConfigGroup);
+ if (!tdeApp->config()->readBoolEntry("toolcontexthelp", true)) return;
p = m_mParentView->inverseMapPoint(p);
diff --git a/src/gui/editors/notation/FontViewFrame.cpp b/src/gui/editors/notation/FontViewFrame.cpp
index febb5ce..7aa7a28 100644
--- a/src/gui/editors/notation/FontViewFrame.cpp
+++ b/src/gui/editors/notation/FontViewFrame.cpp
@@ -182,8 +182,8 @@ void FontViewFrame::paintEvent( TQPaintEvent* e )
if (i == 0) {
if (j == 0)
continue;
- p.setFont(kapp->font());
- TQFontMetrics afm(kapp->font());
+ p.setFont(tdeApp->font());
+ TQFontMetrics afm(tdeApp->font());
TQString s = TQString("%1").arg(m_row * 256 + (j - 1) * 16);
p.drawText(x - afm.width(s), y, s);
p.setPen(TQColor(190, 190, 255));
@@ -191,7 +191,7 @@ void FontViewFrame::paintEvent( TQPaintEvent* e )
p.setPen(TQt::black);
continue;
} else if (j == 0) {
- p.setFont(kapp->font());
+ p.setFont(tdeApp->font());
TQString s = TQString("%1").arg(i - 1);
p.drawText(x, y, s);
p.setPen(TQColor(190, 190, 255));
diff --git a/src/gui/editors/notation/NotationEraser.cpp b/src/gui/editors/notation/NotationEraser.cpp
index e5ba5a6..75adfaa 100644
--- a/src/gui/editors/notation/NotationEraser.cpp
+++ b/src/gui/editors/notation/NotationEraser.cpp
@@ -45,7 +45,7 @@ NotationEraser::NotationEraser(NotationView* view)
: NotationTool("NotationEraser", view),
m_collapseRest(false)
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup(NotationViewConfigGroup);
m_collapseRest = config->readBoolEntry("collapse", false);
diff --git a/src/gui/editors/notation/NotationHLayout.cpp b/src/gui/editors/notation/NotationHLayout.cpp
index fec7422..eb1e490 100644
--- a/src/gui/editors/notation/NotationHLayout.cpp
+++ b/src/gui/editors/notation/NotationHLayout.cpp
@@ -73,7 +73,7 @@ NotationHLayout::NotationHLayout(Composition *c, NotePixmapFactory *npf,
{
// NOTATION_DEBUG << "NotationHLayout::NotationHLayout()" << endl;
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("Notation Options");
m_keySigCancelMode = config->readNumEntry("keysigcancelmode", 1);
}
@@ -253,7 +253,7 @@ NotationHLayout::scanStaff(Staff &staff, timeT startTime, timeT endTime)
NOTATION_DEBUG << "ottava shift at start:" << ottavaShift << ", ottavaEnd " << ottavaEnd << endl;
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("Notation Options");
int accOctaveMode = config->readNumEntry("accidentaloctavemode", 1);
@@ -1264,7 +1264,7 @@ NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
int startBar = getComposition()->getBarNumber(startTime);
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("Notation Options");
bool showInvisibles = config->readBoolEntry("showinvisibles", true);
diff --git a/src/gui/editors/notation/NotationStaff.cpp b/src/gui/editors/notation/NotationStaff.cpp
index 638afd9..59d6803 100644
--- a/src/gui/editors/notation/NotationStaff.cpp
+++ b/src/gui/editors/notation/NotationStaff.cpp
@@ -96,7 +96,7 @@ NotationStaff::NotationStaff(TQCanvas *canvas, Segment *segment,
m_ready(false),
m_lastRenderedBar(0)
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup(NotationViewConfigGroup);
m_colourQuantize = config->readBoolEntry("colourquantize", false);
@@ -431,7 +431,7 @@ NotationStaff::getNoteNameAtCanvasCoords(double x, int y,
::Rosegarden::Key key;
getClefAndKeyAtCanvasCoords(x, y, clef, key);
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup);
int baseOctave = config->readNumEntry("midipitchoctave", -2);
@@ -915,7 +915,7 @@ NotationStaff::renderSingleElement(ViewElementList::iterator &vli,
<Bool>(BaseProperties::INVISIBLE, invisible) && invisible) {
if (m_printPainter)
return ;
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("Notation Options");
bool showInvisibles = config->readBoolEntry("showinvisibles", true);
if (!showInvisibles)
diff --git a/src/gui/editors/notation/NotationStrings.cpp b/src/gui/editors/notation/NotationStrings.cpp
index 513be1c..a29ac2c 100644
--- a/src/gui/editors/notation/NotationStrings.cpp
+++ b/src/gui/editors/notation/NotationStrings.cpp
@@ -258,7 +258,7 @@ NotationStrings::makeNoteMenuLabel(timeT duration,
}
}
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup);
GeneralConfigurationPage::NoteNameStyle noteNameStyle =
(GeneralConfigurationPage::NoteNameStyle)
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index 7965718..d545f76 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -4805,7 +4805,7 @@ void NotationView::slotEditPaste()
(clipboard->getSingleSegment()->getEndTime() -
clipboard->getSingleSegment()->getStartTime());
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup(NotationViewConfigGroup);
PasteEventsCommand::PasteType defaultType = (PasteEventsCommand::PasteType)
config->readUnsignedNumEntry("pastetype",
@@ -4839,7 +4839,7 @@ void NotationView::slotEditGeneralPaste()
LinedStaff *staff = getCurrentLinedStaff();
Segment &segment = staff->getSegment();
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup(NotationViewConfigGroup);
PasteEventsCommand::PasteType defaultType = (PasteEventsCommand::PasteType)
config->readUnsignedNumEntry("pastetype",
diff --git a/src/gui/editors/notation/NoteFontFactory.cpp b/src/gui/editors/notation/NoteFontFactory.cpp
index 8994225..6390d54 100644
--- a/src/gui/editors/notation/NoteFontFactory.cpp
+++ b/src/gui/editors/notation/NoteFontFactory.cpp
@@ -55,7 +55,7 @@ NoteFontFactory::getFontNames(bool forceRescan)
if (!m_fontNames.empty())
return m_fontNames;
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup(NotationViewConfigGroup);
TQString fontNameList = "";
diff --git a/src/gui/editors/notation/NoteInserter.cpp b/src/gui/editors/notation/NoteInserter.cpp
index 74d51d6..eaed244 100644
--- a/src/gui/editors/notation/NoteInserter.cpp
+++ b/src/gui/editors/notation/NoteInserter.cpp
@@ -69,7 +69,7 @@ NoteInserter::NoteInserter(NotationView* view)
{
TQIconSet icon;
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup(NotationViewConfigGroup);
m_autoBeam = config->readBoolEntry("autobeam", true);
m_matrixInsertType = (config->readNumEntry("inserttype", 0) > 0);
diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp
index 47ded9b..ffee779 100644
--- a/src/gui/editors/notation/NotePixmapFactory.cpp
+++ b/src/gui/editors/notation/NotePixmapFactory.cpp
@@ -224,7 +224,7 @@ NotePixmapFactory::init(std::string fontName, int size)
// sizes only and we want pixels
TQFont timeSigFont(defaultTimeSigFontFamily),
textFont(defaultSerifFontFamily);
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup(NotationViewConfigGroup);
m_timeSigFont = config->readFontEntry("timesigfont", &timeSigFont);
@@ -3217,7 +3217,7 @@ NotePixmapFactory::getTextFont(const Text &text) const
tiny = true;
}
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
TQFont textFont;
diff --git a/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp b/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
index 7d9abe8..d550b6d 100644
--- a/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
+++ b/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
@@ -217,19 +217,19 @@ AudioInstrumentParameterPanel::setButtonColour(
// Set the bypass colour on the plugin button
if (bypassState) {
button->
- setPaletteForegroundColor(kapp->palette().
+ setPaletteForegroundColor(tdeApp->palette().
color(TQPalette::Active, TQColorGroup::Button));
button->
- setPaletteBackgroundColor(kapp->palette().
+ setPaletteBackgroundColor(tdeApp->palette().
color(TQPalette::Active, TQColorGroup::ButtonText));
} else if (colour == TQt::black) {
button->
- setPaletteForegroundColor(kapp->palette().
+ setPaletteForegroundColor(tdeApp->palette().
color(TQPalette::Active, TQColorGroup::ButtonText));
button->
- setPaletteBackgroundColor(kapp->palette().
+ setPaletteBackgroundColor(tdeApp->palette().
color(TQPalette::Active, TQColorGroup::Button));
} else {
button->
diff --git a/src/gui/editors/parameters/SegmentParameterBox.cpp b/src/gui/editors/parameters/SegmentParameterBox.cpp
index b23ee9a..6a593a2 100644
--- a/src/gui/editors/parameters/SegmentParameterBox.cpp
+++ b/src/gui/editors/parameters/SegmentParameterBox.cpp
@@ -1011,7 +1011,7 @@ SegmentParameterBox::updateHighLow()
Pitch highest(m_highestPlayable, accidental);
Pitch lowest(m_lowestPlayable, accidental);
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup);
int base = config->readNumEntry("midipitchoctave", -2);
//!!! FIXME this code is broken, and needs to be fixed after the fashion of
diff --git a/src/gui/editors/parameters/TrackParameterBox.cpp b/src/gui/editors/parameters/TrackParameterBox.cpp
index febded0..4e9c5f8 100644
--- a/src/gui/editors/parameters/TrackParameterBox.cpp
+++ b/src/gui/editors/parameters/TrackParameterBox.cpp
@@ -106,7 +106,7 @@ TrackParameterBox::TrackParameterBox( RosegardenGUIDoc *doc,
title_font.setBold(true);
// Set up default expansions for the collapsing elements
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
TQString groupTemp = config->group();
config->setGroup("CollapsingFrame");
bool expanded = config->readBoolEntry("trackparametersplayback", true);
@@ -593,7 +593,7 @@ TrackParameterBox::updateHighLow()
Pitch highest(m_highestPlayable, accidental);
Pitch lowest(m_lowestPlayable, accidental);
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup);
int base = config->readNumEntry("midipitchoctave", -2);
bool useSharps = true;
diff --git a/src/gui/editors/segment/ControlEditorDialog.cpp b/src/gui/editors/segment/ControlEditorDialog.cpp
index 3c1fcd3..abc6564 100644
--- a/src/gui/editors/segment/ControlEditorDialog.cpp
+++ b/src/gui/editors/segment/ControlEditorDialog.cpp
@@ -115,7 +115,7 @@ ControlEditorDialog::ControlEditorDialog(TQWidget *parent,
for (int i = 1; i < 9; ++i)
m_listView->setColumnAlignment(i, TQt::AlignHCenter);
- m_listView->restoreLayout(kapp->config(), ControlEditorConfigGroup);
+ m_listView->restoreLayout(tdeApp->config(), ControlEditorConfigGroup);
TQFrame* btnBox = new TQFrame(mainFrame);
@@ -178,7 +178,7 @@ ControlEditorDialog::~ControlEditorDialog()
{
RG_DEBUG << "\n*** ControlEditorDialog::~ControlEditorDialog\n" << endl;
- m_listView->saveLayout(kapp->config(), ControlEditorConfigGroup);
+ m_listView->saveLayout(tdeApp->config(), ControlEditorConfigGroup);
if (m_doc)
m_doc->getCommandHistory()->detachView(actionCollection());
diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp
index 3be2998..4bd649c 100644
--- a/src/gui/editors/segment/MarkerEditor.cpp
+++ b/src/gui/editors/segment/MarkerEditor.cpp
@@ -223,7 +223,7 @@ MarkerEditor::~MarkerEditor()
{
RG_DEBUG << "MarkerEditor::~MarkerEditor" << endl;
- m_listView->saveLayout(kapp->config(), MarkerEditorConfigGroup);
+ m_listView->saveLayout(tdeApp->config(), MarkerEditorConfigGroup);
if (m_doc)
m_doc->getCommandHistory()->detachView(actionCollection());
@@ -252,8 +252,8 @@ MarkerEditor::slotUpdate()
Composition::markerconstiterator it;
- kapp->config()->setGroup(MarkerEditorConfigGroup);
- int timeMode = kapp->config()->readNumEntry("timemode", 0);
+ tdeApp->config()->setGroup(MarkerEditorConfigGroup);
+ int timeMode = tdeApp->config()->readNumEntry("timemode", 0);
for (it = markers.begin(); it != markers.end(); ++it) {
TQString timeString = makeTimeString((*it)->getTime(), timeMode);
@@ -386,8 +386,8 @@ MarkerEditor::setupActions()
KStdAction::stdName(KStdAction::Redo));
TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
- kapp->config()->setGroup(MarkerEditorConfigGroup);
- int timeMode = kapp->config()->readNumEntry("timemode", 0);
+ tdeApp->config()->setGroup(MarkerEditorConfigGroup);
+ int timeMode = tdeApp->config()->readNumEntry("timemode", 0);
TDERadioAction *action;
@@ -567,24 +567,24 @@ MarkerEditor::makeTimeString(timeT time, int timeMode)
void
MarkerEditor::slotMusicalTime()
{
- kapp->config()->setGroup(MarkerEditorConfigGroup);
- kapp->config()->writeEntry("timemode", 0);
+ tdeApp->config()->setGroup(MarkerEditorConfigGroup);
+ tdeApp->config()->writeEntry("timemode", 0);
slotUpdate();
}
void
MarkerEditor::slotRealTime()
{
- kapp->config()->setGroup(MarkerEditorConfigGroup);
- kapp->config()->writeEntry("timemode", 1);
+ tdeApp->config()->setGroup(MarkerEditorConfigGroup);
+ tdeApp->config()->writeEntry("timemode", 1);
slotUpdate();
}
void
MarkerEditor::slotRawTime()
{
- kapp->config()->setGroup(MarkerEditorConfigGroup);
- kapp->config()->writeEntry("timemode", 2);
+ tdeApp->config()->setGroup(MarkerEditorConfigGroup);
+ tdeApp->config()->writeEntry("timemode", 2);
slotUpdate();
}
diff --git a/src/gui/editors/segment/TrackEditor.cpp b/src/gui/editors/segment/TrackEditor.cpp
index 9a76cda..d44112f 100644
--- a/src/gui/editors/segment/TrackEditor.cpp
+++ b/src/gui/editors/segment/TrackEditor.cpp
@@ -169,8 +169,8 @@ TrackEditor::init(TQWidget* rosegardenguiview)
m_segmentCanvas = new CompositionView(m_doc, m_compositionModel, this);
- kapp->config()->setGroup(GeneralOptionsConfigGroup);
- if (kapp->config()->readBoolEntry("backgroundtextures", true)) {
+ tdeApp->config()->setGroup(GeneralOptionsConfigGroup);
+ if (tdeApp->config()->readBoolEntry("backgroundtextures", true)) {
TQPixmap background;
TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
if (background.load(TQString("%1/misc/bg-segmentcanvas.xpm").
diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp
index d086a18..55f1c5b 100644
--- a/src/gui/editors/segment/TriggerSegmentManager.cpp
+++ b/src/gui/editors/segment/TriggerSegmentManager.cpp
@@ -174,7 +174,7 @@ TriggerSegmentManager::~TriggerSegmentManager()
{
RG_DEBUG << "TriggerSegmentManager::~TriggerSegmentManager" << endl;
- m_listView->saveLayout(kapp->config(), TriggerManagerConfigGroup);
+ m_listView->saveLayout(tdeApp->config(), TriggerManagerConfigGroup);
if (m_doc)
m_doc->getCommandHistory()->detachView(actionCollection());
@@ -203,8 +203,8 @@ TriggerSegmentManager::slotUpdate()
Composition::triggersegmentcontainerconstiterator it;
- kapp->config()->setGroup(TriggerManagerConfigGroup);
- int timeMode = kapp->config()->readNumEntry("timemode", 0);
+ tdeApp->config()->setGroup(TriggerManagerConfigGroup);
+ int timeMode = tdeApp->config()->readNumEntry("timemode", 0);
int i = 0;
@@ -399,8 +399,8 @@ TriggerSegmentManager::setupActions()
TQ_SLOT(slotPasteAsNew()), actionCollection(),
"paste_to_trigger_segment");
- kapp->config()->setGroup(TriggerManagerConfigGroup);
- int timeMode = kapp->config()->readNumEntry("timemode", 0);
+ tdeApp->config()->setGroup(TriggerManagerConfigGroup);
+ int timeMode = tdeApp->config()->readNumEntry("timemode", 0);
TDERadioAction *action;
@@ -549,24 +549,24 @@ TriggerSegmentManager::makeDurationString(timeT time,
void
TriggerSegmentManager::slotMusicalTime()
{
- kapp->config()->setGroup(TriggerManagerConfigGroup);
- kapp->config()->writeEntry("timemode", 0);
+ tdeApp->config()->setGroup(TriggerManagerConfigGroup);
+ tdeApp->config()->writeEntry("timemode", 0);
slotUpdate();
}
void
TriggerSegmentManager::slotRealTime()
{
- kapp->config()->setGroup(TriggerManagerConfigGroup);
- kapp->config()->writeEntry("timemode", 1);
+ tdeApp->config()->setGroup(TriggerManagerConfigGroup);
+ tdeApp->config()->writeEntry("timemode", 1);
slotUpdate();
}
void
TriggerSegmentManager::slotRawTime()
{
- kapp->config()->setGroup(TriggerManagerConfigGroup);
- kapp->config()->writeEntry("timemode", 2);
+ tdeApp->config()->setGroup(TriggerManagerConfigGroup);
+ tdeApp->config()->writeEntry("timemode", 2);
slotUpdate();
}
diff --git a/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp b/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp
index 0400f8f..7b4d773 100644
--- a/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp
+++ b/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp
@@ -144,7 +144,7 @@ void AudioPreviewPainter::paintPreviewImage()
haveTempoChange = true;
}
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup);
bool meterLevels = (config->readUnsignedNumEntry("audiopreviewstyle", 1)
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
index 0e055a2..3bad3ca 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
@@ -1328,8 +1328,8 @@ bool CompositionView::event(TQEvent* e)
void CompositionView::enterEvent(TQEvent *e)
{
- kapp->config()->setGroup(GeneralOptionsConfigGroup);
- if (!kapp->config()->readBoolEntry("toolcontexthelp", true)) return;
+ tdeApp->config()->setGroup(GeneralOptionsConfigGroup);
+ if (!tdeApp->config()->readBoolEntry("toolcontexthelp", true)) return;
emit showContextHelp(m_toolContextHelp);
m_contextHelpShown = true;
@@ -1346,8 +1346,8 @@ void CompositionView::slotToolHelpChanged(const TQString &text)
if (m_toolContextHelp == text) return;
m_toolContextHelp = text;
- kapp->config()->setGroup(GeneralOptionsConfigGroup);
- if (!kapp->config()->readBoolEntry("toolcontexthelp", true)) return;
+ tdeApp->config()->setGroup(GeneralOptionsConfigGroup);
+ if (!tdeApp->config()->readBoolEntry("toolcontexthelp", true)) return;
if (m_contextHelpShown) emit showContextHelp(text);
}
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
index a15a6c9..335bab4 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
@@ -479,8 +479,8 @@ SegmentSelector::handleMouseMove(TQMouseEvent *e)
void SegmentSelector::setContextHelpFor(TQPoint p, bool ctrlPressed)
{
- kapp->config()->setGroup(GeneralOptionsConfigGroup);
- if (!kapp->config()->readBoolEntry("toolcontexthelp", true)) return;
+ tdeApp->config()->setGroup(GeneralOptionsConfigGroup);
+ if (!tdeApp->config()->readBoolEntry("toolcontexthelp", true)) return;
CompositionItem item = m_canvas->getFirstItemAt(p);