From aef5eada7f51ee48f3d21448db290bd8f06953a8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:50:20 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- ksim/ksim.cpp | 2 +- ksim/ksimsysinfo.cpp | 4 ++-- ksim/ksimview.cpp | 2 +- ksim/library/pluginloader.cpp | 4 ++-- ksim/library/themeloader.cpp | 8 ++++---- ksim/monitorprefs.cpp | 2 +- ksim/monitors/disk/ksimdisk.cpp | 6 +++--- ksim/monitors/filesystem/filesystemwidget.cpp | 18 +++++++++--------- ksim/monitors/filesystem/filesystemwidget.h | 8 ++++---- ksim/monitors/net/ksimnet.cpp | 8 ++++---- ksim/themeprefs.cpp | 2 +- 11 files changed, 32 insertions(+), 32 deletions(-) (limited to 'ksim') diff --git a/ksim/ksim.cpp b/ksim/ksim.cpp index e74f768..0134c51 100644 --- a/ksim/ksim.cpp +++ b/ksim/ksim.cpp @@ -37,7 +37,7 @@ extern "C" { KDE_EXPORT KPanelExtension *init(TQWidget *parent, const TQString &configFile) { - KGlobal::locale()->insertCatalogue("ksim"); + TDEGlobal::locale()->insertCatalogue("ksim"); return new KSim::PanelExtension(configFile, KPanelExtension::Normal, KPanelExtension::About | KPanelExtension::Help | KPanelExtension::Preferences | KPanelExtension::ReportBug, diff --git a/ksim/ksimsysinfo.cpp b/ksim/ksimsysinfo.cpp index 7140e3a..7c39e22 100644 --- a/ksim/ksimsysinfo.cpp +++ b/ksim/ksimsysinfo.cpp @@ -76,7 +76,7 @@ void KSim::Sysinfo::clockUptimeUpdate() if (m_timeLabel) { TQTime now = TQTime::currentTime(); - time = KGlobal::locale()->formatTime(now, true); + time = TDEGlobal::locale()->formatTime(now, true); if ( now == TQTime(0, 0) ) updateDate = true; @@ -86,7 +86,7 @@ void KSim::Sysinfo::clockUptimeUpdate() // only update the date when necessary if (m_dateLabel) { if (updateDate) { - m_dateLabel->setText(KGlobal::locale()->formatDate(TQDate::currentDate())); + m_dateLabel->setText(TDEGlobal::locale()->formatDate(TQDate::currentDate())); updateDate = false; } } diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp index 4f91647..8b991f2 100644 --- a/ksim/ksimview.cpp +++ b/ksim/ksimview.cpp @@ -330,7 +330,7 @@ void KSim::MainView::reparseConfig(bool emitReload, void KSim::MainView::addPlugins() { - TQStringList locatedFiles = KGlobal::dirs()->findAllResources("data", "ksim/monitors/*.desktop"); + TQStringList locatedFiles = TDEGlobal::dirs()->findAllResources("data", "ksim/monitors/*.desktop"); TQStringList::ConstIterator it; for (it = locatedFiles.begin(); it != locatedFiles.end(); ++it) { diff --git a/ksim/library/pluginloader.cpp b/ksim/library/pluginloader.cpp index 71b17b7..2126790 100644 --- a/ksim/library/pluginloader.cpp +++ b/ksim/library/pluginloader.cpp @@ -171,7 +171,7 @@ KSim::PluginInfo KSim::PluginLoader::findPluginInfo(const TQString &name, switch (type) { case Name: { - TQStringList files = KGlobal::dirs()->findAllResources("data", "ksim/monitors/*.desktop"); + TQStringList files = TDEGlobal::dirs()->findAllResources("data", "ksim/monitors/*.desktop"); TQStringList::ConstIterator it; for (it = files.begin(); it != files.end(); ++it) { KDesktopFile file((*it)); @@ -183,7 +183,7 @@ KSim::PluginInfo KSim::PluginLoader::findPluginInfo(const TQString &name, break; } case LibName: { - TQStringList files = KGlobal::dirs()->findAllResources("data", "ksim/monitors/*.desktop"); + TQStringList files = TDEGlobal::dirs()->findAllResources("data", "ksim/monitors/*.desktop"); TQStringList::ConstIterator it; for (it = files.begin(); it != files.end(); ++it) { KDesktopFile file((*it)); diff --git a/ksim/library/themeloader.cpp b/ksim/library/themeloader.cpp index ff52525..60e2031 100644 --- a/ksim/library/themeloader.cpp +++ b/ksim/library/themeloader.cpp @@ -362,7 +362,7 @@ TQFont KSim::Theme::currentFont() const return KSim::ThemeLoader::currentFont(); break; case 4: - return KGlobalSettings::generalFont(); + return TDEGlobalSettings::generalFont(); break; } @@ -660,7 +660,7 @@ TQColor KSim::Theme::textColour(const TQString &itemType, const TQString &entry) const { if (d->recolour) - return KGlobalSettings::textColor(); + return TDEGlobalSettings::textColor(); return readColourEntry(itemType, entry, 0); } @@ -1134,7 +1134,7 @@ TQString KSim::ThemeLoader::currentUrl() KSim::Config::config()->setGroup("Theme"); TQString folder(KSim::Config::config()->readEntry("Name")); folder.prepend("ksim/themes/").append("/"); - TQString dirName(KGlobal::dirs()->findResourceDir("data", folder)); + TQString dirName(TDEGlobal::dirs()->findResourceDir("data", folder)); dirName += folder; return dirName; @@ -1142,7 +1142,7 @@ TQString KSim::ThemeLoader::currentUrl() TQString KSim::ThemeLoader::defaultUrl() { - return KGlobal::dirs()->findDirs("data", "ksim/themes/ksim").first(); + return TDEGlobal::dirs()->findDirs("data", "ksim/themes/ksim").first(); } int KSim::ThemeLoader::currentAlternative() diff --git a/ksim/monitorprefs.cpp b/ksim/monitorprefs.cpp index 0038c85..d85be8a 100644 --- a/ksim/monitorprefs.cpp +++ b/ksim/monitorprefs.cpp @@ -45,7 +45,7 @@ KSim::MonitorPrefs::MonitorPrefs(TQWidget *parent, const char *name) setSelectionMode(TQListView::Single); // Scan for .desktop files and enter them into the KListView - m_locatedFiles = KGlobal::dirs()->findAllResources("data", "ksim/monitors/*.desktop"); + m_locatedFiles = TDEGlobal::dirs()->findAllResources("data", "ksim/monitors/*.desktop"); m_locatedFiles.sort(); TQStringList::ConstIterator it; for (it = m_locatedFiles.begin(); it != m_locatedFiles.end(); ++it) { diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp index cccf0a5..6c91d00 100644 --- a/ksim/monitors/disk/ksimdisk.cpp +++ b/ksim/monitors/disk/ksimdisk.cpp @@ -216,13 +216,13 @@ void DiskView::updateDisplay() if (m_useSeperatly) { it.current()->first->setValue(diskData.readBlocks, diskData.writeBlocks); it.current()->first->setText(i18n("in: %1k") - .arg(KGlobal::locale()->formatNumber((float)diskData.readBlocks / 1024.0, 1)), - i18n("out: %1k").arg(KGlobal::locale()->formatNumber((float)diskData.writeBlocks / 1024.0, 1))); + .arg(TDEGlobal::locale()->formatNumber((float)diskData.readBlocks / 1024.0, 1)), + i18n("out: %1k").arg(TDEGlobal::locale()->formatNumber((float)diskData.writeBlocks / 1024.0, 1))); } else { it.current()->first->setValue(diff, 0); it.current()->first->setText(i18n("%1k") - .arg(KGlobal::locale()->formatNumber((float)diff / 1024.0, 1))); + .arg(TDEGlobal::locale()->formatNumber((float)diff / 1024.0, 1))); } it.current()->second->setMaxValue(it.current()->first->maxValue()); diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp index 7286e0f..b7ded52 100644 --- a/ksim/monitors/filesystem/filesystemwidget.cpp +++ b/ksim/monitors/filesystem/filesystemwidget.cpp @@ -169,16 +169,16 @@ bool FilesystemWidget::eventFilter(TQObject *o, TQEvent *e) return TQWidget::eventFilter(o, e); } -void FilesystemWidget::receivedStderr(KProcess *, char *buffer, int length) +void FilesystemWidget::receivedStderr(TDEProcess *, char *buffer, int length) { m_stderrString.setLatin1(buffer, length); } -void FilesystemWidget::processExited(KProcess *) +void FilesystemWidget::processExited(TDEProcess *) { delete m_process; m_process = 0; - kdDebug(2003) << "Deleting KProcess pointer" << endl; + kdDebug(2003) << "Deleting TDEProcess pointer" << endl; if (m_stderrString.isEmpty()) return; @@ -198,16 +198,16 @@ void FilesystemWidget::processExited(KProcess *) void FilesystemWidget::createProcess(const TQString &command, const TQString &point) { - m_process = new KProcess(); + m_process = new TDEProcess(); connect(m_process, - TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - TQT_SLOT(receivedStderr(KProcess *, char *, int))); + TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + TQT_SLOT(receivedStderr(TDEProcess *, char *, int))); connect(m_process, - TQT_SIGNAL(processExited(KProcess *)), - TQT_SLOT(processExited(KProcess *))); + TQT_SIGNAL(processExited(TDEProcess *)), + TQT_SLOT(processExited(TDEProcess *))); (*m_process) << command << point; - void(m_process->start(KProcess::NotifyOnExit, KProcess::Stderr)); + void(m_process->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr)); } void FilesystemWidget::showMenu(uint id) diff --git a/ksim/monitors/filesystem/filesystemwidget.h b/ksim/monitors/filesystem/filesystemwidget.h index 9cd3f61..2a8f116 100644 --- a/ksim/monitors/filesystem/filesystemwidget.h +++ b/ksim/monitors/filesystem/filesystemwidget.h @@ -24,7 +24,7 @@ #include -class KProcess; +class TDEProcess; class TQVBoxLayout; class FilesystemWidget : public TQWidget @@ -44,8 +44,8 @@ class FilesystemWidget : public TQWidget bool eventFilter(TQObject *, TQEvent *); private slots: - void receivedStderr(KProcess *, char *, int); - void processExited(KProcess *); + void receivedStderr(TDEProcess *, char *, int); + void processExited(TDEProcess *); private: class Filesystem @@ -73,7 +73,7 @@ class FilesystemWidget : public TQWidget typedef TQPtrList ProgressList; ProgressList m_list; TQVBoxLayout *m_layout; - KProcess *m_process; + TDEProcess *m_process; TQString m_stderrString; }; #endif diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp index 2d3bd9c..a8e57ce 100644 --- a/ksim/monitors/net/ksimnet.cpp +++ b/ksim/monitors/net/ksimnet.cpp @@ -391,8 +391,8 @@ void NetView::updateGraph() ( *it ).chart()->setValue( receiveDiff, sendDiff ); ( *it ).setMaxValue( ( *it ).chart()->maxValue() ); - TQString receiveString = KGlobal::locale()->formatNumber( ( float ) receiveDiff / 1024.0, 1 ); - TQString sendString = KGlobal::locale()->formatNumber( ( float ) sendDiff / 1024.0, 1 ); + TQString receiveString = TDEGlobal::locale()->formatNumber( ( float ) receiveDiff / 1024.0, 1 ); + TQString sendString = TDEGlobal::locale()->formatNumber( ( float ) sendDiff / 1024.0, 1 ); ( *it ).chart()->setText( i18n( "in: %1k" ).arg( receiveString ), i18n( "out: %1k" ).arg( sendString ) ); @@ -402,8 +402,8 @@ void NetView::updateGraph() ( *it ).setData( NetData() ); ( *it ).chart()->setValue( 0, 0 ); - ( *it ).chart()->setText( i18n( "in: %1k" ).arg( KGlobal::locale()->formatNumber( 0.0, 1 ) ), - i18n( "out: %1k" ).arg( KGlobal::locale()->formatNumber( 0.0, 1 ) ) ); + ( *it ).chart()->setText( i18n( "in: %1k" ).arg( TDEGlobal::locale()->formatNumber( 0.0, 1 ) ), + i18n( "out: %1k" ).arg( TDEGlobal::locale()->formatNumber( 0.0, 1 ) ) ); if ( ( *it ).label() ) ( *it ).label()->setText( i18n( "offline" ) ); diff --git a/ksim/themeprefs.cpp b/ksim/themeprefs.cpp index aaa726d..dc12f45 100644 --- a/ksim/themeprefs.cpp +++ b/ksim/themeprefs.cpp @@ -130,7 +130,7 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name) this, TQT_SLOT(showFontDialog(int))); m_themeLayout->addMultiCellWidget(m_fontsCombo, 5, 5, 4, 4); - TQStringList locatedFiles = KGlobal::dirs()->findDirs("data", "ksim/themes"); + TQStringList locatedFiles = TDEGlobal::dirs()->findDirs("data", "ksim/themes"); for (TQStringList::ConstIterator it = locatedFiles.begin(); it != locatedFiles.end(); ++it) readThemes(*it); } -- cgit v1.2.1