summaryrefslogtreecommitdiffstats
path: root/ksayit
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:40:41 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:40:41 -0600
commit0b54abbdf80cef08e5cb8ef7b8b7af31c54dd9b4 (patch)
tree322767e10a0d28887f54f3cefe6399098713dc82 /ksayit
parent11f5b1c38c194ef53638bafa0df70e821a7a6427 (diff)
downloadtdeaccessibility-0b54abbdf80cef08e5cb8ef7b8b7af31c54dd9b4.tar.gz
tdeaccessibility-0b54abbdf80cef08e5cb8ef7b8b7af31c54dd9b4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'ksayit')
-rw-r--r--ksayit/KTTSD_Lib/kttsdlib.cpp2
-rw-r--r--ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp10
-rw-r--r--ksayit/KTTSD_Lib/kttsdlibsetupimpl.h2
-rw-r--r--ksayit/src/contextmenuhandler.cpp2
-rw-r--r--ksayit/src/docbookclasses.cpp30
-rw-r--r--ksayit/src/doctreeviewimpl.cpp2
-rw-r--r--ksayit/src/ksayitsystemtray.cpp6
-rw-r--r--ksayit/src/voicesetupdlg.cpp4
8 files changed, 29 insertions, 29 deletions
diff --git a/ksayit/KTTSD_Lib/kttsdlib.cpp b/ksayit/KTTSD_Lib/kttsdlib.cpp
index a3a0269..ff2e023 100644
--- a/ksayit/KTTSD_Lib/kttsdlib.cpp
+++ b/ksayit/KTTSD_Lib/kttsdlib.cpp
@@ -30,7 +30,7 @@
KTTSDLib::KTTSDLib(TQObject *parent, const char *name, TDEApplication *Appl)
: TQObject(parent, name), m_Appl(Appl)
{
- KGlobal::locale()->insertCatalogue("libKTTSD");
+ TDEGlobal::locale()->insertCatalogue("libKTTSD");
m_talker = new kttsdlibtalker2(static_cast<TQObject*>(this), "kttsdlibtalker");
connect(m_talker, TQT_SIGNAL(signalTextFinished(const uint)),
this, TQT_SLOT(slotTextFinished(const uint)) );
diff --git a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp
index 86f5c14..b0bc36c 100644
--- a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp
+++ b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp
@@ -54,18 +54,18 @@ void KTTSDlibSetupImpl::slotLaunchControlcenter()
}
// invoke the Control Center Module
- KProcess *kcmproc = new KProcess();
- connect(kcmproc, TQT_SIGNAL(processExited(KProcess*)),
- this, TQT_SLOT(slotKCMProcessExited(KProcess*)) );
+ TDEProcess *kcmproc = new TDEProcess();
+ connect(kcmproc, TQT_SIGNAL(processExited(TDEProcess*)),
+ this, TQT_SLOT(slotKCMProcessExited(TDEProcess*)) );
(*kcmproc) << "kcmshell";
(*kcmproc) << "kcmkttsd";
- kcmproc->start(KProcess::NotifyOnExit);
+ kcmproc->start(TDEProcess::NotifyOnExit);
kcm_Button->setEnabled(false);
}
-void KTTSDlibSetupImpl::slotKCMProcessExited(KProcess *p)
+void KTTSDlibSetupImpl::slotKCMProcessExited(TDEProcess *p)
{
kdDebug(100200) << "slotKCMProcessExited()" << endl;
kcm_Button->setEnabled(true);
diff --git a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h
index 6b5e253..c2b4add 100644
--- a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h
+++ b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h
@@ -41,7 +41,7 @@ private slots:
/** Called when the Control Center Module was closed.
*/
- void slotKCMProcessExited(KProcess *p);
+ void slotKCMProcessExited(TDEProcess *p);
};
#endif
diff --git a/ksayit/src/contextmenuhandler.cpp b/ksayit/src/contextmenuhandler.cpp
index e6605f9..5a83404 100644
--- a/ksayit/src/contextmenuhandler.cpp
+++ b/ksayit/src/contextmenuhandler.cpp
@@ -123,7 +123,7 @@ ContextMenuHandler::ContextMenuHandler(TQObject *parent, const char *name)
m_popupmenu = NULL;
m_item = NULL;
initActions();
- m_XmlFilePath = KGlobal::dirs()->findResource("data", "ksayit/ContextMenus.xml");
+ m_XmlFilePath = TDEGlobal::dirs()->findResource("data", "ksayit/ContextMenus.xml");
}
diff --git a/ksayit/src/docbookclasses.cpp b/ksayit/src/docbookclasses.cpp
index 87e15de..afe83a7 100644
--- a/ksayit/src/docbookclasses.cpp
+++ b/ksayit/src/docbookclasses.cpp
@@ -55,7 +55,7 @@ ListViewInterface::ListViewInterface(KListView *lv, TQString label)
RobDocument::RobDocument(KListView *lv, TQString label)
: ListViewInterface( lv, label )
{
- TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("contents", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("contents", KIcon::Small);
this->setPixmap(0, pixmap);
// new Concept (begin)
@@ -119,7 +119,7 @@ TQVariant RobDocument::getValue( unsigned int index ) const
Overview::Overview(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
- TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
this->setPixmap(0, pixmap);
this->setText(3, "0"); // upmost element
@@ -174,7 +174,7 @@ TQVariant Overview::getValue( unsigned int index ) const
Date::Date(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
- TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
this->setPixmap(0, pixmap);
this->setText(3, "00000001");
@@ -241,7 +241,7 @@ TQVariant Date::getValue( unsigned int index ) const
ReleaseInfo::ReleaseInfo(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
- TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
this->setPixmap(0, pixmap);
this->setText(3, "00000002");
@@ -308,7 +308,7 @@ TQVariant ReleaseInfo::getValue( unsigned int index ) const
AuthorGroup::AuthorGroup(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
- TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("tdmconfig", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("tdmconfig", KIcon::Small);
this->setPixmap(0, pixmap);
this->setText(3, "00000003");
@@ -364,7 +364,7 @@ TQVariant AuthorGroup::getValue( unsigned int index ) const
Author::Author(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
- TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("personal", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("personal", KIcon::Small);
this->setPixmap(0, pixmap);
// new Concept (begin)
@@ -448,7 +448,7 @@ TQVariant Author::getValue( unsigned int index ) const
KeywordSet::KeywordSet(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
- TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("txt", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("txt", KIcon::Small);
this->setPixmap(0, pixmap);
this->setText(3, "00000004");
@@ -569,7 +569,7 @@ TQVariant Keyword::getValue( unsigned int index ) const
Abstract::Abstract(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
- TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
this->setPixmap(0, pixmap);
this->setText(3, "00000005");
@@ -625,7 +625,7 @@ TQVariant Abstract::getValue( unsigned int index ) const
Para::Para(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
- TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
this->setPixmap(0, pixmap);
// new Concept (begin)
@@ -699,7 +699,7 @@ TQVariant Para::getValue( unsigned int index ) const
Chapter::Chapter(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
- TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
this->setPixmap(0, pixmap);
// new Concept (begin)
@@ -760,7 +760,7 @@ TQVariant Chapter::getValue( unsigned int index ) const
Sect1::Sect1(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
- TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
this->setPixmap(0, pixmap);
// new Concept (begin)
@@ -820,7 +820,7 @@ TQVariant Sect1::getValue( unsigned int index ) const
Sect2::Sect2(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
- TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
this->setPixmap(0, pixmap);
// new Concept (begin)
@@ -880,7 +880,7 @@ TQVariant Sect2::getValue( unsigned int index ) const
Sect3::Sect3(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
- TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
this->setPixmap(0, pixmap);
// new Concept (begin)
@@ -940,7 +940,7 @@ TQVariant Sect3::getValue( unsigned int index ) const
Sect4::Sect4(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
- TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
this->setPixmap(0, pixmap);
// new Concept (begin)
@@ -1000,7 +1000,7 @@ TQVariant Sect4::getValue( unsigned int index ) const
Sect5::Sect5(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
- TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
this->setPixmap(0, pixmap);
// new Concept (begin)
diff --git a/ksayit/src/doctreeviewimpl.cpp b/ksayit/src/doctreeviewimpl.cpp
index 5fd76c3..34e5f64 100644
--- a/ksayit/src/doctreeviewimpl.cpp
+++ b/ksayit/src/doctreeviewimpl.cpp
@@ -927,7 +927,7 @@ void DocTreeViewImpl::slotNewDate()
date->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
// get current date
TQString today;
- today = KGlobal::locale()->formatDate(TQDate::currentDate(Qt::LocalTime), true);
+ today = TDEGlobal::locale()->formatDate(TQDate::currentDate(Qt::LocalTime), true);
date->setText( 1, today);
date->setValue( KSayItGlobal::RAWDATA, today );
date->setValue( KSayItGlobal::RTFDATA, today );
diff --git a/ksayit/src/ksayitsystemtray.cpp b/ksayit/src/ksayitsystemtray.cpp
index cf10c32..ca8196c 100644
--- a/ksayit/src/ksayitsystemtray.cpp
+++ b/ksayit/src/ksayitsystemtray.cpp
@@ -232,7 +232,7 @@ void State::mouseReleaseEventCall(KSayItSystemTray *caller, TQMouseEvent *e)
////////////////////////////////////////////
StateWAIT::StateWAIT(){
- m_traypixmap = KGlobal::iconLoader()->loadIcon("ksayit", KIcon::Toolbar);
+ m_traypixmap = TDEGlobal::iconLoader()->loadIcon("ksayit", KIcon::Toolbar);
}
StateWAIT::~StateWAIT(){
}
@@ -273,7 +273,7 @@ void StateWAIT::mouseReleaseEvent(KSayItSystemTray *caller, TQMouseEvent *e)
////////////////////////////////////////////
StateSAY::StateSAY(){
- m_traypixmap = KGlobal::iconLoader()->loadIcon("ksayit_talking", KIcon::Toolbar);
+ m_traypixmap = TDEGlobal::iconLoader()->loadIcon("ksayit_talking", KIcon::Toolbar);
}
StateSAY::~StateSAY(){
}
@@ -315,7 +315,7 @@ void StateSAY::mouseReleaseEvent(KSayItSystemTray *caller, TQMouseEvent *e)
////////////////////////////////////////////
StateCLIPEMPTY::StateCLIPEMPTY(){
- m_traypixmap = KGlobal::iconLoader()->loadIcon("ksayit_clipempty", KIcon::Toolbar);
+ m_traypixmap = TDEGlobal::iconLoader()->loadIcon("ksayit_clipempty", KIcon::Toolbar);
}
StateCLIPEMPTY::~StateCLIPEMPTY(){
}
diff --git a/ksayit/src/voicesetupdlg.cpp b/ksayit/src/voicesetupdlg.cpp
index d8df70a..9fb65d9 100644
--- a/ksayit/src/voicesetupdlg.cpp
+++ b/ksayit/src/voicesetupdlg.cpp
@@ -66,7 +66,7 @@ VoiceSetupDlg::~VoiceSetupDlg()
void VoiceSetupDlg::initVoicePage()
{
- TQPixmap icon = KGlobal::iconLoader()->loadIcon("ksayit", KIcon::Toolbar, KIcon::SizeMedium);
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon("ksayit", KIcon::Toolbar, KIcon::SizeMedium);
TQFrame *voicePage = addPage( i18n( "Voice" ), i18n("Voice Settings"), icon );
TQVBoxLayout *voiceLayout = new TQVBoxLayout( voicePage, 0, spacingHint() );
@@ -77,7 +77,7 @@ void VoiceSetupDlg::initVoicePage()
void VoiceSetupDlg::initFXPage()
{
- TQPixmap icon = KGlobal::iconLoader()->loadIcon("ksysguard", KIcon::Toolbar, KIcon::SizeMedium);
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon("ksysguard", KIcon::Toolbar, KIcon::SizeMedium);
m_fxPage = addPage( i18n( "Audio FX" ), i18n("Effect Stack"), icon );
TQVBoxLayout *fxLayout = new TQVBoxLayout( m_fxPage, 0, spacingHint() );