summaryrefslogtreecommitdiffstats
path: root/src/gui/editors/notation
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/editors/notation')
-rw-r--r--src/gui/editors/notation/NotationView.cpp28
-rw-r--r--src/gui/editors/notation/NotationView.h4
-rw-r--r--src/gui/editors/notation/NoteFontFactory.cpp2
-rw-r--r--src/gui/editors/notation/NoteFontMap.cpp2
-rw-r--r--src/gui/editors/notation/NotePixmapFactory.cpp2
-rw-r--r--src/gui/editors/notation/NoteStyleFactory.cpp2
-rw-r--r--src/gui/editors/notation/NoteStyleFileReader.cpp2
-rw-r--r--src/gui/editors/notation/SystemFont.cpp2
8 files changed, 22 insertions, 22 deletions
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;