diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-31 21:46:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-31 21:46:40 -0600 |
| commit | acf699af8244896500e654cccdc8aae7e5b545db (patch) | |
| tree | 9ddbc02f8dfa15b0f6090b909322b8ebde91e3bd /src/gui/editors/notation | |
| parent | 1d53865a04b4bcbab61f730bcbcc5452e9d04ce7 (diff) | |
| download | rosegarden-acf699af8244896500e654cccdc8aae7e5b545db.tar.gz rosegarden-acf699af8244896500e654cccdc8aae7e5b545db.zip | |
Rename KStartup for enhanced compatibility with KDE4
Diffstat (limited to 'src/gui/editors/notation')
| -rw-r--r-- | src/gui/editors/notation/NoteFontFactory.cpp | 8 | ||||
| -rw-r--r-- | src/gui/editors/notation/NotePixmapFactory.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/editors/notation/NoteFontFactory.cpp b/src/gui/editors/notation/NoteFontFactory.cpp index 9760734..47855a1 100644 --- a/src/gui/editors/notation/NoteFontFactory.cpp +++ b/src/gui/editors/notation/NoteFontFactory.cpp @@ -32,7 +32,7 @@ #include "misc/Strings.h" #include "document/ConfigGroups.h" #include "base/Exception.h" -#include "gui/kdeext/KStartupLogo.h" +#include "gui/kdeext/TDEStartupLogo.h" #include "NoteFont.h" #include "NoteFontMap.h" #include <tdeconfig.h> @@ -95,7 +95,7 @@ NoteFontFactory::getFontNames(bool forceRescan) if (map.ok()) names.append(strtoqstr(map.getName())); } catch (Exception e) { - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); KMessageBox::error(0, strtoqstr(e.getMessage())); throw; } @@ -167,7 +167,7 @@ NoteFontFactory::getFont(std::string fontName, int size) m_fonts[std::pair<std::string, int>(fontName, size)] = font; return font; } catch (Exception e) { - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); KMessageBox::error(0, strtoqstr(e.getMessage())); throw; } @@ -198,7 +198,7 @@ NoteFontFactory::getDefaultFontName() defaultFont = *fontNames.begin(); else { TQString message = i18n("Can't obtain a default font -- no fonts found"); - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); KMessageBox::error(0, message); throw NoFontsAvailable(qstrtostr(message)); } diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp index f34eeaa..b661d88 100644 --- a/src/gui/editors/notation/NotePixmapFactory.cpp +++ b/src/gui/editors/notation/NotePixmapFactory.cpp @@ -43,7 +43,7 @@ #include "gui/general/GUIPalette.h" #include "gui/general/PixmapFunctions.h" #include "gui/general/Spline.h" -#include "gui/kdeext/KStartupLogo.h" +#include "gui/kdeext/TDEStartupLogo.h" #include "NotationStrings.h" #include "NotationView.h" #include "NoteCharacter.h" @@ -192,7 +192,7 @@ NotePixmapFactory::init(std::string fontName, int size) try { m_style = NoteStyleFactory::getStyle(NoteStyleFactory::DefaultStyle); } catch (NoteStyleFactory::StyleUnavailable u) { - KStartupLogo::hideIfStillThere(); + TDEStartupLogo::hideIfStillThere(); KMessageBox::error(0, i18n(strtoqstr(u.getMessage()).ascii())); throw; } |