summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:24:53 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:24:53 -0600
commitd9b70de56a7c1ce685cc8fd119d9b004e1fbfdee (patch)
tree64b2d68617a65f38415feee55540640ec579eda9
parentf2f2c5781e60ffdf342231c2844a6d47f332b4ca (diff)
downloadtderadio-d9b70de5.tar.gz
tderadio-d9b70de5.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
-rw-r--r--kradio3/plugins/gui-error-log/errorlog.cpp8
-rw-r--r--kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp4
-rw-r--r--kradio3/plugins/recording/recording-monitor.cpp8
-rw-r--r--kradio3/src/aboutwidget.cpp6
-rw-r--r--kradio3/src/frequencyradiostation.cpp4
-rw-r--r--kradio3/src/include/plugins.h8
-rw-r--r--kradio3/src/kradioapp.cpp6
-rw-r--r--kradio3/src/main.cpp2
-rw-r--r--kradio3/src/pluginmanager.cpp6
9 files changed, 26 insertions, 26 deletions
diff --git a/kradio3/plugins/gui-error-log/errorlog.cpp b/kradio3/plugins/gui-error-log/errorlog.cpp
index 664538b..7f711c2 100644
--- a/kradio3/plugins/gui-error-log/errorlog.cpp
+++ b/kradio3/plugins/gui-error-log/errorlog.cpp
@@ -56,7 +56,7 @@ ErrorLog::ErrorLog(const TQString &name)
{
TQWidget::setCaption(i18n("KRadio Logger"));
TQFrame *info = addPage(i18n("Information"), i18n("Information"),
- KGlobal::instance()->iconLoader()->loadIcon(
+ TDEGlobal::instance()->iconLoader()->loadIcon(
"messagebox_info", KIcon::NoGroup, KIcon::SizeMedium
)
);
@@ -71,7 +71,7 @@ ErrorLog::ErrorLog(const TQString &name)
TQFrame *warn = addPage(i18n("Warnings"), i18n("Warnings"),
- KGlobal::instance()->iconLoader()->loadIcon(
+ TDEGlobal::instance()->iconLoader()->loadIcon(
"messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium
)
);
@@ -86,7 +86,7 @@ ErrorLog::ErrorLog(const TQString &name)
TQFrame *err = addPage(i18n("Errors"), i18n("Errors"),
- KGlobal::instance()->iconLoader()->loadIcon(
+ TDEGlobal::instance()->iconLoader()->loadIcon(
"messagebox_critical", KIcon::NoGroup, KIcon::SizeMedium
)
);
@@ -99,7 +99,7 @@ ErrorLog::ErrorLog(const TQString &name)
logError(i18n("logging started"));
TQFrame *debug = addPage(i18n("Debugging"), i18n("Debugging"),
- KGlobal::instance()->iconLoader()->loadIcon(
+ TDEGlobal::instance()->iconLoader()->loadIcon(
"find", KIcon::NoGroup, KIcon::SizeMedium
)
);
diff --git a/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp b/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp
index f449122..baa69e3 100644
--- a/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp
+++ b/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp
@@ -403,9 +403,9 @@ void RadioViewFrequencyRadio::drawContents(TQPainter *paint)
TQString s;
if (m_frequency < 10) {
- s = i18n("%1 kHz").arg(KGlobal::locale()->formatNumber((int)(m_frequency * 1000), 0));
+ s = i18n("%1 kHz").arg(TDEGlobal::locale()->formatNumber((int)(m_frequency * 1000), 0));
} else {
- s = i18n("%1 MHz").arg(KGlobal::locale()->formatNumber(m_frequency, 2));
+ s = i18n("%1 MHz").arg(TDEGlobal::locale()->formatNumber(m_frequency, 2));
}
float pxs = xh_f;
diff --git a/kradio3/plugins/recording/recording-monitor.cpp b/kradio3/plugins/recording/recording-monitor.cpp
index a249579..48be95b 100644
--- a/kradio3/plugins/recording/recording-monitor.cpp
+++ b/kradio3/plugins/recording/recording-monitor.cpp
@@ -336,10 +336,10 @@ bool RecordingMonitor::noticeSoundStreamData(SoundStreamID id,
double MB = kB / 1024;
double GB = MB / 1024;
TQString str_size;
- str_size = i18n("%1 Byte").arg(KGlobal::locale()->formatNumber((int)B, 0));
- if (kB > 1) str_size = i18n("%1 kB").arg(KGlobal::locale()->formatNumber(kB, 3));
- if (MB > 1) str_size = i18n("%1 MB").arg(KGlobal::locale()->formatNumber(MB, 3));
- if (GB > 1) str_size = i18n("%1 GB").arg(KGlobal::locale()->formatNumber(GB, 3));
+ str_size = i18n("%1 Byte").arg(TDEGlobal::locale()->formatNumber((int)B, 0));
+ if (kB > 1) str_size = i18n("%1 kB").arg(TDEGlobal::locale()->formatNumber(kB, 3));
+ if (MB > 1) str_size = i18n("%1 MB").arg(TDEGlobal::locale()->formatNumber(MB, 3));
+ if (GB > 1) str_size = i18n("%1 GB").arg(TDEGlobal::locale()->formatNumber(GB, 3));
m_labelSize->setText(str_size);
m_labelRate->setText(i18n("%1 Hz").arg(sf.m_SampleRate));
diff --git a/kradio3/src/aboutwidget.cpp b/kradio3/src/aboutwidget.cpp
index c5548da..2b70a20 100644
--- a/kradio3/src/aboutwidget.cpp
+++ b/kradio3/src/aboutwidget.cpp
@@ -199,7 +199,7 @@ void KRadioAboutWidget::fontChange( const TQFont &/*oldFont*/ )
{
if( mTitleLabel != 0 )
{
- TQFont f( KGlobalSettings::generalFont() );
+ TQFont f( TDEGlobalSettings::generalFont() );
f.setBold( true );
f.setPointSize( 14 ); // Perhaps changeable ?
mTitleLabel->setFont(f);
@@ -207,7 +207,7 @@ void KRadioAboutWidget::fontChange( const TQFont &/*oldFont*/ )
if( mVersionLabel != 0 )
{
- TQFont f( KGlobalSettings::generalFont() );
+ TQFont f( TDEGlobalSettings::generalFont() );
f.setBold( true );
mVersionLabel->setFont(f);
mAuthorLabel->setFont(f);
@@ -262,7 +262,7 @@ TQFrame *KRadioAboutWidget::addLicensePage( const TQString &title,
TQVBoxLayout *vbox = new TQVBoxLayout( page, KDialog::spacingHint() );
TQTextEdit *textEdit = new TQTextEdit( page, "license" );
- textEdit->setFont( KGlobalSettings::fixedFont() );
+ textEdit->setFont( TDEGlobalSettings::fixedFont() );
textEdit->setReadOnly( true );
textEdit->setWordWrap( TQTextEdit::NoWrap );
textEdit->setText( text );
diff --git a/kradio3/src/frequencyradiostation.cpp b/kradio3/src/frequencyradiostation.cpp
index 75257b2..602caec 100644
--- a/kradio3/src/frequencyradiostation.cpp
+++ b/kradio3/src/frequencyradiostation.cpp
@@ -131,9 +131,9 @@ TQString FrequencyRadioStation::description() const
float cf = frequency();
TQString f;
if (cf >= 10)
- f = i18n("%1 MHz").arg(KGlobal::locale()->formatNumber(cf, 2));
+ f = i18n("%1 MHz").arg(TDEGlobal::locale()->formatNumber(cf, 2));
else
- f = i18n("%1 kHz").arg(KGlobal::locale()->formatNumber(cf * 1000, 0));
+ f = i18n("%1 kHz").arg(TDEGlobal::locale()->formatNumber(cf * 1000, 0));
return f;
}
diff --git a/kradio3/src/include/plugins.h b/kradio3/src/include/plugins.h
index 6fd6d70..023e35d 100644
--- a/kradio3/src/include/plugins.h
+++ b/kradio3/src/include/plugins.h
@@ -137,12 +137,12 @@ protected :
#define PLUGIN_LIBRARY_FUNCTIONS(class_name, i18nName, description) \
extern "C" void KRadioPlugin_LoadLibrary() \
{ \
- KGlobal::locale()->insertCatalogue(i18nName); \
+ TDEGlobal::locale()->insertCatalogue(i18nName); \
} \
\
extern "C" void KRadioPlugin_UnloadLibrary() \
{ \
- KGlobal::locale()->removeCatalogue(i18nName); \
+ TDEGlobal::locale()->removeCatalogue(i18nName); \
} \
\
extern "C" void KRadioPlugin_GetAvailablePlugins(TQMap<TQString, TQString> &info) \
@@ -163,12 +163,12 @@ extern "C" PluginBase *KRadioPlugin_CreatePlugin(const TQString &type, const TQS
#define PLUGIN_LIBRARY_FUNCTIONS2(class_name1, i18nName, description1, class_name2, description2) \
extern "C" void KRadioPlugin_LoadLibrary() \
{ \
- KGlobal::locale()->insertCatalogue(i18nName); \
+ TDEGlobal::locale()->insertCatalogue(i18nName); \
} \
\
extern "C" void KRadioPlugin_UnloadLibrary() \
{ \
- KGlobal::locale()->removeCatalogue(i18nName); \
+ TDEGlobal::locale()->removeCatalogue(i18nName); \
} \
\
extern "C" void KRadioPlugin_GetAvailablePlugins(TQMap<TQString, TQString> &info) \
diff --git a/kradio3/src/kradioapp.cpp b/kradio3/src/kradioapp.cpp
index b7a9c5b..c008a1d 100644
--- a/kradio3/src/kradioapp.cpp
+++ b/kradio3/src/kradioapp.cpp
@@ -141,7 +141,7 @@ KRadioApp::~KRadioApp()
void KRadioApp::saveState()
{
IErrorLogClient::staticLogDebug(i18n("saveState"));
- saveState(KGlobal::config());
+ saveState(TDEGlobal::config());
}
void KRadioApp::saveState (KConfig *c)
@@ -193,7 +193,7 @@ void KRadioApp::restoreState (KConfig *c)
if (n_libs < 6) { // this seems to be a meaningful minimum value for a working kradio setup
TQStringList libs
- = KGlobal::dirs()->findAllResources("lib", "kradio/plugins/*.so");
+ = TDEGlobal::dirs()->findAllResources("lib", "kradio/plugins/*.so");
TQValueListIterator<TQString> end = libs.end();
int idx = 0;
// progress->progressBar()->setTotalSteps(libs.count());
@@ -338,7 +338,7 @@ PluginBase *KRadioApp::CreatePlugin (PluginManager *manager, const TQString &cla
insert_profiler.stop();
//BlockProfiler restore_profiler("KRadioApp::CreatePlugin - restore");
- //retval->restoreState(KGlobal::config());
+ //retval->restoreState(TDEGlobal::config());
}
return retval;
diff --git a/kradio3/src/main.cpp b/kradio3/src/main.cpp
index 5378495..b574817 100644
--- a/kradio3/src/main.cpp
+++ b/kradio3/src/main.cpp
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
profiler_kradioapp.stop();
BlockProfiler profiler_restore("main::restore");
- a.restoreState(KGlobal::config());
+ a.restoreState(TDEGlobal::config());
a.startPlugins();
profiler_restore.stop();
diff --git a/kradio3/src/pluginmanager.cpp b/kradio3/src/pluginmanager.cpp
index aac2c65..5c7ea56 100644
--- a/kradio3/src/pluginmanager.cpp
+++ b/kradio3/src/pluginmanager.cpp
@@ -292,7 +292,7 @@ TQFrame *PluginManager::addConfigurationPage (const ConfigPageInfo &info)
TQFrame *f = m_configDialog->addPage(
info.itemName,
info.pageHeader,
- KGlobal::instance()->iconLoader()->loadIcon( info.iconName, KIcon::NoGroup, KIcon::SizeMedium )
+ TDEGlobal::instance()->iconLoader()->loadIcon( info.iconName, KIcon::NoGroup, KIcon::SizeMedium )
);
// fill config frame with layout ...
@@ -371,7 +371,7 @@ void PluginManager::addAboutPage (PluginBase *forWhom,
TQFrame *f = m_aboutDialog->addPage(
info.itemName,
info.pageHeader,
- KGlobal::instance()->iconLoader()->loadIcon( info.iconName, KIcon::NoGroup, KIcon::SizeMedium )
+ TDEGlobal::instance()->iconLoader()->loadIcon( info.iconName, KIcon::NoGroup, KIcon::SizeMedium )
);
// register this frame and config page
@@ -516,7 +516,7 @@ void PluginManager::slotConfigOK()
{
emit sigConfigOK();
if (m_Application)
- m_Application->saveState(KGlobal::config());
+ m_Application->saveState(TDEGlobal::config());
}