diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:46 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:46 -0600 |
| commit | 27430f06c6cc2187c639f59f342f07f1fde91a8b (patch) | |
| tree | 493c1095950b7f0a82690cedac1b749666be1b47 /kscd/kscd.cpp | |
| parent | 794a886cbd6d6893d62026f3800b95051652fc5a (diff) | |
| download | tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.tar.gz tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kscd/kscd.cpp')
| -rw-r--r-- | kscd/kscd.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp index cc9bc389..49ab2950 100644 --- a/kscd/kscd.cpp +++ b/kscd/kscd.cpp @@ -227,7 +227,7 @@ KSCD::~KSCD() void KSCD::initGlobalShortcuts() { - m_globalAccel = new KGlobalAccel( TQT_TQOBJECT(this) ); + m_globalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this) ); //Definition of global shortcuts is based on 'local' shortcuts which follow //the WIN key. @@ -280,7 +280,7 @@ void KSCD::initFont() /* int theSmallPtSize = 10; // Find a font that fits the 13 and 14 pixel widgets - TQFont fn( KGlobalSettings::generalFont().family(), theSmallPtSize, TQFont::Bold ); + TQFont fn( TDEGlobalSettings::generalFont().family(), theSmallPtSize, TQFont::Bold ); bool fits = false; while (!fits && theSmallPtSize > 1) { @@ -293,7 +293,7 @@ void KSCD::initFont() fits = true; } } - smallfont = TQFont(KGlobalSettings::generalFont().family(), theSmallPtSize, TQFont::Bold); + smallfont = TQFont(TDEGlobalSettings::generalFont().family(), theSmallPtSize, TQFont::Bold); */ } // initFont() @@ -371,7 +371,7 @@ void KSCD::setupPopups() connect( infoPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(information(int)) ); - KHelpMenu* helpMenu = new KHelpMenu(this, KGlobal::instance()->aboutData(), false); + KHelpMenu* helpMenu = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false); mainPopup->insertItem(SmallIcon("help"),i18n("&Help"), helpMenu->menu()); mainPopup->insertSeparator(); m_actions->action(KStdAction::name(KStdAction::Quit))->plug(mainPopup); |