diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:26:42 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:26:42 -0600 |
commit | 59ff04ffaf48f18383b39ea6da17b8e18b6b50c3 (patch) | |
tree | 3c5878d4255116c6146b38687214acf355eb7564 /src/gui/editors | |
parent | c329cc4e7edb85184878ba8238c4344cbaba2ac0 (diff) | |
download | rosegarden-59ff04ffaf48f18383b39ea6da17b8e18b6b50c3.tar.gz rosegarden-59ff04ffaf48f18383b39ea6da17b8e18b6b50c3.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/gui/editors')
22 files changed, 40 insertions, 40 deletions
diff --git a/src/gui/editors/eventlist/EventView.cpp b/src/gui/editors/eventlist/EventView.cpp index b1f7f87..c902a93 100644 --- a/src/gui/editors/eventlist/EventView.cpp +++ b/src/gui/editors/eventlist/EventView.cpp @@ -1117,7 +1117,7 @@ EventView::setupActions() { EditViewBase::setupActions("eventlist.rc"); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/event-insert.png")); new KAction(i18n("&Insert Event"), icon, Key_I, TQT_TQOBJECT(this), diff --git a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp index 1b7a4ed..accbcc5 100644 --- a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp +++ b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp @@ -442,7 +442,7 @@ GuitarChordSelectorDialog::getAvailableChordFiles() std::vector<TQString> names; // Read config for default directory - TQStringList chordDictFiles = KGlobal::dirs()->findAllResources("appdata", "chords/*.xml"); + TQStringList chordDictFiles = TDEGlobal::dirs()->findAllResources("appdata", "chords/*.xml"); for(TQStringList::iterator i = chordDictFiles.begin(); i != chordDictFiles.end(); ++i) { NOTATION_DEBUG << "GuitarChordSelectorDialog::getAvailableChordFiles : adding file " << *i << endl; @@ -456,7 +456,7 @@ bool GuitarChordSelectorDialog::saveUserChordMap() { // Read config for user directory - TQString userDir = KGlobal::dirs()->saveLocation("appdata", "chords/"); + TQString userDir = TDEGlobal::dirs()->saveLocation("appdata", "chords/"); TQString userChordDictPath = userDir + "/user_chords.xml"; diff --git a/src/gui/editors/matrix/MatrixEraser.cpp b/src/gui/editors/matrix/MatrixEraser.cpp index 9f60479..7edddfc 100644 --- a/src/gui/editors/matrix/MatrixEraser.cpp +++ b/src/gui/editors/matrix/MatrixEraser.cpp @@ -47,7 +47,7 @@ MatrixEraser::MatrixEraser(MatrixView* parent) : MatrixTool("MatrixEraser", parent), m_currentStaff(0) { - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm"); TQIconSet icon = TQIconSet(pixmap); diff --git a/src/gui/editors/matrix/MatrixMover.cpp b/src/gui/editors/matrix/MatrixMover.cpp index cb604ba..4366ab3 100644 --- a/src/gui/editors/matrix/MatrixMover.cpp +++ b/src/gui/editors/matrix/MatrixMover.cpp @@ -60,7 +60,7 @@ MatrixMover::MatrixMover(MatrixView* parent) : m_currentStaff(0), m_lastPlayedPitch(-1) { - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm"); TQIconSet icon = TQIconSet(pixmap); diff --git a/src/gui/editors/matrix/MatrixPainter.cpp b/src/gui/editors/matrix/MatrixPainter.cpp index 04048a7..18a4822 100644 --- a/src/gui/editors/matrix/MatrixPainter.cpp +++ b/src/gui/editors/matrix/MatrixPainter.cpp @@ -58,7 +58,7 @@ MatrixPainter::MatrixPainter(MatrixView* parent) m_currentElement(0), m_currentStaff(0) { - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm"); TQIconSet icon = TQIconSet(pixmap); diff --git a/src/gui/editors/matrix/MatrixResizer.cpp b/src/gui/editors/matrix/MatrixResizer.cpp index 253f3c0..2335cd7 100644 --- a/src/gui/editors/matrix/MatrixResizer.cpp +++ b/src/gui/editors/matrix/MatrixResizer.cpp @@ -56,7 +56,7 @@ MatrixResizer::MatrixResizer(MatrixView* parent) m_currentElement(0), m_currentStaff(0) { - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm"); TQIconSet icon = TQIconSet(pixmap); diff --git a/src/gui/editors/matrix/MatrixSelector.cpp b/src/gui/editors/matrix/MatrixSelector.cpp index 50a1692..5b3dd26 100644 --- a/src/gui/editors/matrix/MatrixSelector.cpp +++ b/src/gui/editors/matrix/MatrixSelector.cpp @@ -86,7 +86,7 @@ MatrixSelector::MatrixSelector(MatrixView* view) TQT_SLOT(slotMoveSelected()), actionCollection(), "move"); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/resize.xpm"); TQIconSet icon = TQIconSet(pixmap); diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp index a63ca0a..5f69a39 100644 --- a/src/gui/editors/matrix/MatrixView.cpp +++ b/src/gui/editors/matrix/MatrixView.cpp @@ -166,7 +166,7 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc, { RG_DEBUG << "MatrixView ctor: drumMode " << drumMode << "\n"; - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/toolbar"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/toolbar"); TQPixmap matrixPixmap(pixmapDir + "/matrix.xpm"); m_dockLeft = createDockWidget("params dock", matrixPixmap, 0L, @@ -199,7 +199,7 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc, if (m_config->readBoolEntry("backgroundtextures-1.6-plus", true)) { TQPixmap background; TQString pixmapDir = - KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); // We now use a lined background for the non-percussion matrix, // suggested and supplied by Alessandro Preziosi TQString backgroundPixmap = isDrumMode() ? "bg-paper-white.xpm" : "bg-matrix-lines.xpm"; @@ -635,7 +635,7 @@ void MatrixView::setupActions() // KRadioAction* toolAction = 0; - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/select.xpm")); toolAction = new KRadioAction(i18n("&Select and Edit"), icon, Key_F2, diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp index 7c9f498..4a8fd00 100644 --- a/src/gui/editors/notation/NotationView.cpp +++ b/src/gui/editors/notation/NotationView.cpp @@ -511,7 +511,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, m_headersTopFrame = new TQFrame(getCentralWidget()); TQGridLayout * headersTopGrid = new TQGridLayout(m_headersTopFrame, 2, 2); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQCanvasPixmap pixmap(pixmapDir + "/misc/close.xpm"); TQPushButton * hideHeadersButton = new TQPushButton(m_headersTopFrame); @@ -1335,7 +1335,7 @@ void NotationView::positionPages() m_config->setGroup(NotationViewConfigGroup); if (m_config->readBoolEntry("backgroundtextures", true)) { TQString pixmapDir = - KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); if (background.load(TQString("%1/misc/bg-paper-cream.xpm"). arg(pixmapDir))) { haveBackground = true; @@ -1818,7 +1818,7 @@ void NotationView::setupActions() // int layoutMode = m_config->readNumEntry("layoutmode", 0); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/linear-layout.xpm"); icon = TQIconSet(pixmap); @@ -2466,7 +2466,7 @@ void NotationView::setupActions() "clear_selection"); // TQString pixmapDir = - // KGlobal::dirs()->findResource("appdata", "pixmaps/"); + // TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); // icon = TQIconSet(TQCanvasPixmap(pixmapDir + "/toolbar/eventfilter.xpm")); new KAction(i18n("&Filter Selection"), "filter", Key_F + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotFilterSelection()), actionCollection(), @@ -4640,7 +4640,7 @@ NotationView::slotFilePrintPreview() printingView.print(true); } -std::map<KProcess *, KTempFile *> NotationView::m_lilyTempFileMap; +std::map<TDEProcess *, KTempFile *> NotationView::m_lilyTempFileMap; void NotationView::slotPrintLilyPond() { @@ -4655,15 +4655,15 @@ void NotationView::slotPrintLilyPond() if (!exportLilyPondFile(file->name(), true)) { return ; } - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "rosegarden-lilypondview"; *proc << "--graphical"; *proc << "--print"; *proc << file->name(); - connect(proc, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotLilyPondViewProcessExited(KProcess *))); + connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(slotLilyPondViewProcessExited(TDEProcess *))); m_lilyTempFileMap[proc] = file; - proc->start(KProcess::NotifyOnExit); + proc->start(TDEProcess::NotifyOnExit); } void NotationView::slotPreviewLilyPond() @@ -4679,18 +4679,18 @@ void NotationView::slotPreviewLilyPond() if (!exportLilyPondFile(file->name(), true)) { return ; } - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "rosegarden-lilypondview"; *proc << "--graphical"; *proc << "--pdf"; *proc << file->name(); - connect(proc, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotLilyPondViewProcessExited(KProcess *))); + connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(slotLilyPondViewProcessExited(TDEProcess *))); m_lilyTempFileMap[proc] = file; - proc->start(KProcess::NotifyOnExit); + proc->start(TDEProcess::NotifyOnExit); } -void NotationView::slotLilyPondViewProcessExited(KProcess *p) +void NotationView::slotLilyPondViewProcessExited(TDEProcess *p) { delete m_lilyTempFileMap[p]; m_lilyTempFileMap.erase(p); diff --git a/src/gui/editors/notation/NotationView.h b/src/gui/editors/notation/NotationView.h index 861a523..56b39ae 100644 --- a/src/gui/editors/notation/NotationView.h +++ b/src/gui/editors/notation/NotationView.h @@ -366,7 +366,7 @@ public slots: */ void slotPrintLilyPond(); void slotPreviewLilyPond(); - void slotLilyPondViewProcessExited(KProcess *); + void slotLilyPondViewProcessExited(TDEProcess *); /** * put the marked text/object into the clipboard and remove it @@ -1115,7 +1115,7 @@ protected: bool m_printMode; int m_printSize; - static std::map<KProcess *, KTempFile *> m_lilyTempFileMap; + static std::map<TDEProcess *, KTempFile *> m_lilyTempFileMap; int m_showHeadersGroup; QDeferScrollView * m_headersGroupView; diff --git a/src/gui/editors/notation/NoteFontFactory.cpp b/src/gui/editors/notation/NoteFontFactory.cpp index ec0a18f..20c3ba8 100644 --- a/src/gui/editors/notation/NoteFontFactory.cpp +++ b/src/gui/editors/notation/NoteFontFactory.cpp @@ -74,7 +74,7 @@ NoteFontFactory::getFontNames(bool forceRescan) NOTATION_DEBUG << "NoteFontFactory::getFontNames: No names available, rescanning..." << endl; TQString mappingDir = - KGlobal::dirs()->findResource("appdata", "fonts/mappings/"); + TDEGlobal::dirs()->findResource("appdata", "fonts/mappings/"); TQDir dir(mappingDir); if (!dir.exists()) { std::cerr << "NoteFontFactory::getFontNames: mapping directory \"" diff --git a/src/gui/editors/notation/NoteFontMap.cpp b/src/gui/editors/notation/NoteFontMap.cpp index f82a263..3060375 100644 --- a/src/gui/editors/notation/NoteFontMap.cpp +++ b/src/gui/editors/notation/NoteFontMap.cpp @@ -52,7 +52,7 @@ NoteFontMap::NoteFontMap(std::string name) : m_errorString(i18n("unknown error")), m_ok(true) { - m_fontDirectory = KGlobal::dirs()->findResource("appdata", "fonts/"); + m_fontDirectory = TDEGlobal::dirs()->findResource("appdata", "fonts/"); TQString mapFileName; diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp index 9103d4e..cb028c5 100644 --- a/src/gui/editors/notation/NotePixmapFactory.cpp +++ b/src/gui/editors/notation/NotePixmapFactory.cpp @@ -1931,7 +1931,7 @@ NotePixmapFactory::makeUnknownPixmap() TQCanvasPixmap* NotePixmapFactory::makeToolbarPixmap(const char *name, bool menuSize) { - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString fileBase = pixmapDir + "/toolbar/"; if (menuSize) fileBase += "menu-"; fileBase += name; diff --git a/src/gui/editors/notation/NoteStyleFactory.cpp b/src/gui/editors/notation/NoteStyleFactory.cpp index 4303cc6..340a657 100644 --- a/src/gui/editors/notation/NoteStyleFactory.cpp +++ b/src/gui/editors/notation/NoteStyleFactory.cpp @@ -49,7 +49,7 @@ NoteStyleFactory::getAvailableStyleNames() { std::vector<NoteStyleName> names; - TQString styleDir = KGlobal::dirs()->findResource("appdata", "styles/"); + TQString styleDir = TDEGlobal::dirs()->findResource("appdata", "styles/"); TQDir dir(styleDir); if (!dir.exists()) { std::cerr << "NoteStyle::getAvailableStyleNames: directory \"" << styleDir.ascii() diff --git a/src/gui/editors/notation/NoteStyleFileReader.cpp b/src/gui/editors/notation/NoteStyleFileReader.cpp index 10e5f13..d8a552f 100644 --- a/src/gui/editors/notation/NoteStyleFileReader.cpp +++ b/src/gui/editors/notation/NoteStyleFileReader.cpp @@ -45,7 +45,7 @@ NoteStyleFileReader::NoteStyleFileReader(std::string name) : m_haveNote(false) { TQString styleDirectory = - KGlobal::dirs()->findResource("appdata", "styles/"); + TDEGlobal::dirs()->findResource("appdata", "styles/"); TQString styleFileName = TQString("%1/%2.xml").arg(styleDirectory).arg(strtoqstr(name)); diff --git a/src/gui/editors/notation/SystemFont.cpp b/src/gui/editors/notation/SystemFont.cpp index bf98e58..e49a68f 100644 --- a/src/gui/editors/notation/SystemFont.cpp +++ b/src/gui/editors/notation/SystemFont.cpp @@ -71,7 +71,7 @@ SystemFont::loadSystemFont(const SystemFontSpec &spec) } if (!haveFcDirectory) { - TQString fontDir = KGlobal::dirs()->findResource("appdata", "fonts/"); + TQString fontDir = TDEGlobal::dirs()->findResource("appdata", "fonts/"); if (!FcConfigAppFontAddDir(FcConfigGetCurrent(), (const FcChar8 *)fontDir.latin1())) { NOTATION_DEBUG << "SystemFont::loadSystemFont[Xft]: Failed to add font directory " << fontDir << " to fontconfig, continuing without it" << endl; diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp index 20fb211..0f25aeb 100644 --- a/src/gui/editors/segment/MarkerEditor.cpp +++ b/src/gui/editors/segment/MarkerEditor.cpp @@ -387,7 +387,7 @@ MarkerEditor::setupActions() actionCollection(), KStdAction::stdName(KStdAction::Redo)); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); kapp->config()->setGroup(MarkerEditorConfigGroup); int timeMode = kapp->config()->readNumEntry("timemode", 0); diff --git a/src/gui/editors/segment/PlayList.cpp b/src/gui/editors/segment/PlayList.cpp index 95d9cfc..90dae37 100644 --- a/src/gui/editors/segment/PlayList.cpp +++ b/src/gui/editors/segment/PlayList.cpp @@ -229,7 +229,7 @@ void PlayList::save() item = dynamic_cast<PlayListViewItem*>(item->nextSibling()); } - KConfig *kc = KGlobal::config(); + KConfig *kc = TDEGlobal::config(); KConfigGroupSaver cs(kc, PlayListConfigGroup); kc->writeEntry("Playlist Files", urlList); @@ -238,7 +238,7 @@ void PlayList::save() void PlayList::restore() { - KConfig *kc = KGlobal::config(); + KConfig *kc = TDEGlobal::config(); getListView()->restoreLayout(kc, PlayListConfigGroup); KConfigGroupSaver cs(kc, PlayListConfigGroup); diff --git a/src/gui/editors/segment/TrackButtons.cpp b/src/gui/editors/segment/TrackButtons.cpp index 2d5a66d..e4eb458 100644 --- a/src/gui/editors/segment/TrackButtons.cpp +++ b/src/gui/editors/segment/TrackButtons.cpp @@ -644,7 +644,7 @@ TrackButtons::populateInstrumentPopup(Instrument *thisTrackInstr, TQPopupMenu* i if (!havePixmaps) { TQString pixmapDir = - KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); connectedPixmap.load (TQString("%1/misc/connected.xpm").arg(pixmapDir)); diff --git a/src/gui/editors/segment/TrackEditor.cpp b/src/gui/editors/segment/TrackEditor.cpp index 9eeb21b..cb8db68 100644 --- a/src/gui/editors/segment/TrackEditor.cpp +++ b/src/gui/editors/segment/TrackEditor.cpp @@ -174,7 +174,7 @@ TrackEditor::init(TQWidget* rosegardenguiview) kapp->config()->setGroup(GeneralOptionsConfigGroup); if (kapp->config()->readBoolEntry("backgroundtextures", true)) { TQPixmap background; - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); if (background.load(TQString("%1/misc/bg-segmentcanvas.xpm"). arg(pixmapDir))) { m_segmentCanvas->setBackgroundPixmap(background); diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp index 62fd06b..60dde0c 100644 --- a/src/gui/editors/segment/TriggerSegmentManager.cpp +++ b/src/gui/editors/segment/TriggerSegmentManager.cpp @@ -382,7 +382,7 @@ TriggerSegmentManager::setupActions() m_closeButton->setText(close->text()); connect(m_closeButton, TQT_SIGNAL(released()), TQT_TQOBJECT(this), TQT_SLOT(slotClose())); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); // some adjustments new KToolBarPopupAction(i18n("Und&o"), diff --git a/src/gui/editors/tempo/TempoView.cpp b/src/gui/editors/tempo/TempoView.cpp index 0569fd9..7d7346f 100644 --- a/src/gui/editors/tempo/TempoView.cpp +++ b/src/gui/editors/tempo/TempoView.cpp @@ -575,7 +575,7 @@ TempoView::setupActions() { EditViewBase::setupActions("tempoview.rc", false); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/event-insert-tempo.png")); new KAction(AddTempoChangeCommand::getGlobalName(), icon, Key_I, TQT_TQOBJECT(this), |