summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:24:28 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:24:28 -0600
commit4d6cade4fdcec31669bcc95f6cbb0dee4d2f09d9 (patch)
treef1ab93c2fc3a6b9b78b27547b5656159d29adc5a
parent3a040438b0e301de770f6bb0eaa178b68d006f15 (diff)
downloadkonversation-4d6cade4fdcec31669bcc95f6cbb0dee4d2f09d9.tar.gz
konversation-4d6cade4fdcec31669bcc95f6cbb0dee4d2f09d9.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
-rw-r--r--konversation/src/channel.cpp20
-rw-r--r--konversation/src/channeloptionsdialog.cpp2
-rw-r--r--konversation/src/chatwindow.cpp4
-rw-r--r--konversation/src/config/konversation.kcfg8
-rw-r--r--konversation/src/config/preferences.cpp2
-rw-r--r--konversation/src/dccchat.cpp4
-rw-r--r--konversation/src/dcctransferdetailedinfopanel.cpp6
-rw-r--r--konversation/src/dcctransferpanel.cpp2
-rw-r--r--konversation/src/dcctransferpanelitem.cpp10
-rw-r--r--konversation/src/dcctransferrecv.cpp4
-rw-r--r--konversation/src/emoticon.cpp8
-rw-r--r--konversation/src/highlight_preferences.cpp4
-rw-r--r--konversation/src/images.cpp18
-rw-r--r--konversation/src/irccharsets.cpp6
-rw-r--r--konversation/src/ircview.cpp10
-rw-r--r--konversation/src/konversationmainwindow.cpp4
-rw-r--r--konversation/src/konvibookmarkhandler.cpp4
-rw-r--r--konversation/src/linkaddressbook/addressbook_base.cpp2
-rw-r--r--konversation/src/nicksonline.cpp2
-rw-r--r--konversation/src/osd.cpp4
-rw-r--r--konversation/src/query.cpp6
-rw-r--r--konversation/src/rawlog.cpp2
-rw-r--r--konversation/src/scriptlauncher.cpp2
-rw-r--r--konversation/src/server.cpp4
-rw-r--r--konversation/src/server.h4
-rw-r--r--konversation/src/statuspanel.cpp6
-rw-r--r--konversation/src/theme_preferences.cpp2
-rw-r--r--konversation/src/topiclabel.cpp4
-rw-r--r--konversation/src/urlcatcher.cpp4
-rw-r--r--konversation/src/viewcontainer.cpp10
-rw-r--r--konversation/src/viewtree.cpp8
-rw-r--r--konversation/src/viewtreeitem.cpp20
32 files changed, 98 insertions, 98 deletions
diff --git a/konversation/src/channel.cpp b/konversation/src/channel.cpp
index 177da6c..1531b59 100644
--- a/konversation/src/channel.cpp
+++ b/konversation/src/channel.cpp
@@ -115,7 +115,7 @@ Channel::Channel(TQWidget* parent, TQString _name) : ChatWindow(parent)
TQSizePolicy greedy = TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
m_vertSplitter = new TQSplitter(Qt::Vertical, this);
- m_vertSplitter->setOpaqueResize(KGlobalSettings::opaqueResize());
+ m_vertSplitter->setOpaqueResize(TDEGlobalSettings::opaqueResize());
TQWidget* topicWidget = new TQWidget(m_vertSplitter);
@@ -182,7 +182,7 @@ Channel::Channel(TQWidget* parent, TQString _name) : ChatWindow(parent)
// (this) The main Box, holding the channel view/topic and the input line
m_horizSplitter = new TQSplitter(m_vertSplitter);
- m_horizSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
+ m_horizSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
// Server will be set later in setServer()
IRCViewBox* ircViewBox = new IRCViewBox(m_horizSplitter, NULL);
@@ -232,7 +232,7 @@ Channel::Channel(TQWidget* parent, TQString _name) : ChatWindow(parent)
awayLabel->hide();
blowfishLabel = new TQLabel(commandLineBox);
blowfishLabel->hide();
- blowfishLabel->setPixmap(KGlobal::iconLoader()->loadIcon("encrypted", KIcon::Toolbar));
+ blowfishLabel->setPixmap(TDEGlobal::iconLoader()->loadIcon("encrypted", KIcon::Toolbar));
channelInput = new IRCInput(commandLineBox);
getTextView()->installEventFilter(channelInput);
@@ -2255,7 +2255,7 @@ void Channel::updateAppearance()
{
fg=colorGroup().foreground();
bg=colorGroup().base();
- abg=KGlobalSettings::alternateBackgroundColor();
+ abg=TDEGlobalSettings::alternateBackgroundColor();
}
channelInput->unsetPalette();
@@ -2289,11 +2289,11 @@ void Channel::updateAppearance()
}
else
{
- getTextView()->setFont(KGlobalSettings::generalFont());
- topicLine->setFont(KGlobalSettings::generalFont());
- channelInput->setFont(KGlobalSettings::generalFont());
- nicknameCombobox->setFont(KGlobalSettings::generalFont());
- limit->setFont(KGlobalSettings::generalFont());
+ getTextView()->setFont(TDEGlobalSettings::generalFont());
+ topicLine->setFont(TDEGlobalSettings::generalFont());
+ channelInput->setFont(TDEGlobalSettings::generalFont());
+ nicknameCombobox->setFont(TDEGlobalSettings::generalFont());
+ limit->setFont(TDEGlobalSettings::generalFont());
}
nicknameListView->resort();
@@ -2305,7 +2305,7 @@ void Channel::updateAppearance()
if (Preferences::customListFont())
nicknameListView->setFont(Preferences::listFont());
else
- nicknameListView->setFont(KGlobalSettings::generalFont());
+ nicknameListView->setFont(TDEGlobalSettings::generalFont());
nicknameListView->refresh();
diff --git a/konversation/src/channeloptionsdialog.cpp b/konversation/src/channeloptionsdialog.cpp
index 1c13f42..e52776b 100644
--- a/konversation/src/channeloptionsdialog.cpp
+++ b/konversation/src/channeloptionsdialog.cpp
@@ -496,7 +496,7 @@ namespace Konversation
TQString BanListViewItem::text(int column) const
{
if (column == 2)
- return KGlobal::locale()->formatDateTime(m_timestamp, true, true);
+ return TDEGlobal::locale()->formatDateTime(m_timestamp, true, true);
return KListViewItem::text(column);
}
diff --git a/konversation/src/chatwindow.cpp b/konversation/src/chatwindow.cpp
index ab7c6ad..d394189 100644
--- a/konversation/src/chatwindow.cpp
+++ b/konversation/src/chatwindow.cpp
@@ -47,7 +47,7 @@ ChatWindow::ChatWindow(TQWidget* parent) : TQVBox(parent)
// The font size of the KTabWidget container may be inappropriately
// small due to the "Tab bar" font size setting.
- setFont(KGlobalSettings::generalFont());
+ setFont(TDEGlobalSettings::generalFont());
}
ChatWindow::~ChatWindow()
@@ -60,7 +60,7 @@ void ChatWindow::updateAppearance()
{
// The font size of the KTabWidget container may be inappropriately
// small due to the "Tab bar" font size setting.
- setFont(KGlobalSettings::generalFont());
+ setFont(TDEGlobalSettings::generalFont());
if (textView)
{
diff --git a/konversation/src/config/konversation.kcfg b/konversation/src/config/konversation.kcfg
index 8cf2b82..dc2894e 100644
--- a/konversation/src/config/konversation.kcfg
+++ b/konversation/src/config/konversation.kcfg
@@ -31,17 +31,17 @@
<whatsthis></whatsthis>
</entry>
<entry key="TextFont" type="Font">
- <default code="true">KGlobalSettings::generalFont()</default>
+ <default code="true">TDEGlobalSettings::generalFont()</default>
<label></label>
<whatsthis></whatsthis>
</entry>
<entry key="ListFont" type="Font">
- <default code="true">KGlobalSettings::generalFont()</default>
+ <default code="true">TDEGlobalSettings::generalFont()</default>
<label></label>
<whatsthis></whatsthis>
</entry>
<entry key="TabFont" type="Font">
- <default code="true">KGlobalSettings::generalFont()</default>
+ <default code="true">TDEGlobalSettings::generalFont()</default>
<label></label>
<whatsthis></whatsthis>
</entry>
@@ -476,7 +476,7 @@
<whatsthis></whatsthis>
</entry>
<entry key="OSDFont" type="Font">
- <default code="true">KGlobalSettings::generalFont()</default>
+ <default code="true">TDEGlobalSettings::generalFont()</default>
<label></label>
<whatsthis></whatsthis>
</entry>
diff --git a/konversation/src/config/preferences.cpp b/konversation/src/config/preferences.cpp
index 8762662..19839fa 100644
--- a/konversation/src/config/preferences.cpp
+++ b/konversation/src/config/preferences.cpp
@@ -443,7 +443,7 @@ const IdentityPtr Preferences::identityById(int id)
TQStringList Preferences::defaultAliasList()
{
// Auto-alias scripts
- TQStringList scripts = KGlobal::dirs()->findAllResources("data","konversation/scripts/*");
+ TQStringList scripts = TDEGlobal::dirs()->findAllResources("data","konversation/scripts/*");
TQFileInfo* fileInfo = new TQFileInfo();
TQStringList aliasList;
TQString newAlias;
diff --git a/konversation/src/dccchat.cpp b/konversation/src/dccchat.cpp
index 5a4205a..fc51e65 100644
--- a/konversation/src/dccchat.cpp
+++ b/konversation/src/dccchat.cpp
@@ -463,8 +463,8 @@ void DccChat::updateAppearance()
}
else
{
- getTextView()->setFont(KGlobalSettings::generalFont());
- m_dccChatInput->setFont(KGlobalSettings::generalFont());
+ getTextView()->setFont(TDEGlobalSettings::generalFont());
+ m_dccChatInput->setFont(TDEGlobalSettings::generalFont());
}
ChatWindow::updateAppearance();
diff --git a/konversation/src/dcctransferdetailedinfopanel.cpp b/konversation/src/dcctransferdetailedinfopanel.cpp
index 8aec7d0..4bdbcb0 100644
--- a/konversation/src/dcctransferdetailedinfopanel.cpp
+++ b/konversation/src/dcctransferdetailedinfopanel.cpp
@@ -120,10 +120,10 @@ void DccTransferDetailedInfoPanel::updateView()
m_progress->setProgress( transfer->getProgress() );
// Current Position:
- m_labelCurrentPosition->setText( KGlobal::locale()->formatNumber( transfer->getTransferringPosition(), 0 ) );
+ m_labelCurrentPosition->setText( TDEGlobal::locale()->formatNumber( transfer->getTransferringPosition(), 0 ) );
// File Size:
- m_labelFileSize->setText( KGlobal::locale()->formatNumber( transfer->getFileSize(), 0 ) );
+ m_labelFileSize->setText( TDEGlobal::locale()->formatNumber( transfer->getFileSize(), 0 ) );
// Current Speed:
m_labelCurrentSpeed->setText( m_item->getCurrentSpeedPrettyText() );
@@ -133,7 +133,7 @@ void DccTransferDetailedInfoPanel::updateView()
// Resumed:
if ( transfer->isResumed() )
- m_labelIsResumed->setText( i18n( "Yes, %1" ).arg( KGlobal::locale()->formatNumber( transfer->getTransferStartPosition(), 0 ) ) );
+ m_labelIsResumed->setText( i18n( "Yes, %1" ).arg( TDEGlobal::locale()->formatNumber( transfer->getTransferStartPosition(), 0 ) ) );
else
m_labelIsResumed->setText( i18n( "No" ) );
diff --git a/konversation/src/dcctransferpanel.cpp b/konversation/src/dcctransferpanel.cpp
index 8b89afa..348f566 100644
--- a/konversation/src/dcctransferpanel.cpp
+++ b/konversation/src/dcctransferpanel.cpp
@@ -110,7 +110,7 @@ void DccTransferPanel::initGUI()
buttonsBox->setSpacing(spacing());
// convenience, undeffed below again to avoid name clashes
- #define icon(s) KGlobal::iconLoader()->loadIconSet( s, KIcon::Small )
+ #define icon(s) TDEGlobal::iconLoader()->loadIconSet( s, KIcon::Small )
m_buttonAccept = new TQPushButton(icon("player_play"), i18n("Accept"), buttonsBox, "start_dcc");
m_buttonAbort = new TQPushButton(icon("stop"), i18n("Abort"), buttonsBox, "abort_dcc");
diff --git a/konversation/src/dcctransferpanelitem.cpp b/konversation/src/dcctransferpanelitem.cpp
index e0ebc49..f8fc1d0 100644
--- a/konversation/src/dcctransferpanelitem.cpp
+++ b/konversation/src/dcctransferpanelitem.cpp
@@ -270,9 +270,9 @@ TQString DccTransferPanelItem::getTypeText() const
TQPixmap DccTransferPanelItem::getTypeIcon() const
{
if ( m_transfer->getType() == DccTransfer::Send )
- return KGlobal::iconLoader()->loadIcon( "up", KIcon::Small );
+ return TDEGlobal::iconLoader()->loadIcon( "up", KIcon::Small );
else
- return KGlobal::iconLoader()->loadIcon( "down", KIcon::Small );
+ return TDEGlobal::iconLoader()->loadIcon( "down", KIcon::Small );
}
TQPixmap DccTransferPanelItem::getStatusIcon() const
@@ -301,7 +301,7 @@ TQPixmap DccTransferPanelItem::getStatusIcon() const
default:
break;
}
- return KGlobal::iconLoader()->loadIcon( icon, KIcon::Small );
+ return TDEGlobal::iconLoader()->loadIcon( icon, KIcon::Small );
}
TQString DccTransferPanelItem::getStatusText() const
@@ -339,8 +339,8 @@ TQString DccTransferPanelItem::getFileSizePrettyText() const
TQString DccTransferPanelItem::getPositionPrettyText( bool detailed ) const
{
if ( detailed )
- return KGlobal::locale()->formatNumber( m_transfer->getTransferringPosition(), 0 ) + " / " +
- KGlobal::locale()->formatNumber( m_transfer->getFileSize(), 0 );
+ return TDEGlobal::locale()->formatNumber( m_transfer->getTransferringPosition(), 0 ) + " / " +
+ TDEGlobal::locale()->formatNumber( m_transfer->getFileSize(), 0 );
else
return KIO::convertSize( m_transfer->getTransferringPosition() ) + " / " + KIO::convertSize( m_transfer->getFileSize() );
}
diff --git a/konversation/src/dcctransferrecv.cpp b/konversation/src/dcctransferrecv.cpp
index 9134a8d..ef2cc0e 100644
--- a/konversation/src/dcctransferrecv.cpp
+++ b/konversation/src/dcctransferrecv.cpp
@@ -83,7 +83,7 @@ TQString DccTransferRecv::getTypeText() const
TQPixmap DccTransferRecv::getTypeIcon() const
{
- return KGlobal::iconLoader()->loadIcon( "down", KIcon::Small );
+ return TDEGlobal::iconLoader()->loadIcon( "down", KIcon::Small );
}
void DccTransferRecv::cleanUp()
@@ -366,7 +366,7 @@ void DccTransferRecv::slotLocalCanResume( KIO::Job* job, KIO::filesize_t size )
"%1<br>"
"Size of the partial file: %2 bytes<br>" )
.arg( m_fileURL.prettyURL() )
- .arg( KGlobal::locale()->formatNumber( size, 0 ) ),
+ .arg( TDEGlobal::locale()->formatNumber( size, 0 ) ),
DccResumeDialog::RA_Resume | DccResumeDialog::RA_Overwrite | DccResumeDialog::RA_Rename | DccResumeDialog::RA_Cancel,
DccResumeDialog::RA_Resume,
size );
diff --git a/konversation/src/emoticon.cpp b/konversation/src/emoticon.cpp
index 96e967f..b85bb9b 100644
--- a/konversation/src/emoticon.cpp
+++ b/konversation/src/emoticon.cpp
@@ -66,16 +66,16 @@ namespace Konversation
}
#if KDE_IS_VERSION(3,3,91)
- TQString filename = KGlobal::dirs()->findResource("emoticons", themeName + "/emoticons.xml");
+ TQString filename = TDEGlobal::dirs()->findResource("emoticons", themeName + "/emoticons.xml");
self()->m_themeName = themeName;
#else
TQString app = "konversation";
- TQString filename = KGlobal::dirs()->findResource("data", app + "/pics/emoticons/" + themeName + "/emoticons.xml");
+ TQString filename = TDEGlobal::dirs()->findResource("data", app + "/pics/emoticons/" + themeName + "/emoticons.xml");
if(filename.isEmpty())
{
app = "kopete";
- filename = KGlobal::dirs()->findResource("data", app + "/pics/emoticons/" + themeName + "/emoticons.xml");
+ filename = TDEGlobal::dirs()->findResource("data", app + "/pics/emoticons/" + themeName + "/emoticons.xml");
}
self()->m_themeName = app + '/' + themeName;
#endif
@@ -174,7 +174,7 @@ namespace Konversation
// Copyright (c) 2002 by Stefan Gehn <metz AT gehn.net>
// Copyright (c) 2002 by Olivier Goffart <ogoffart@tiscalinet.be>
//
- KStandardDirs *dirs = KGlobal::dirs();
+ KStandardDirs *dirs = TDEGlobal::dirs();
TQString pic;
#if KDE_IS_VERSION(3,3,91)
diff --git a/konversation/src/highlight_preferences.cpp b/konversation/src/highlight_preferences.cpp
index 6fa017a..aeeeae1 100644
--- a/konversation/src/highlight_preferences.cpp
+++ b/konversation/src/highlight_preferences.cpp
@@ -52,8 +52,8 @@ Highlight_Config::Highlight_Config(TQWidget* parent, const char* name)
// This code was copied from KNotifyWidget::openSoundDialog() (knotifydialog.cpp) [it's under LGPL v2]
// find the first "sound"-resource that contains files
- TQStringList soundDirs = KGlobal::dirs()->findDirs("data", "konversation/sounds");
- soundDirs += KGlobal::dirs()->resourceDirs( "sound" );
+ TQStringList soundDirs = TDEGlobal::dirs()->findDirs("data", "konversation/sounds");
+ soundDirs += TDEGlobal::dirs()->resourceDirs( "sound" );
if ( !soundDirs.isEmpty() ) {
KURL url;
diff --git a/konversation/src/images.cpp b/konversation/src/images.cpp
index fa1d7f0..133dd15 100644
--- a/konversation/src/images.cpp
+++ b/konversation/src/images.cpp
@@ -31,8 +31,8 @@ Images::Images()
initializeNickIcons();
initializeKimifaceIcons();
- m_closeIcon = KGlobal::iconLoader()->loadIcon("fileclose",KIcon::Small);
- m_disabledCloseIcon = KGlobal::iconLoader()->loadIconSet("fileclose",KIcon::Small).pixmap(TQIconSet::Small, false);
+ m_closeIcon = TDEGlobal::iconLoader()->loadIcon("fileclose",KIcon::Small);
+ m_disabledCloseIcon = TDEGlobal::iconLoader()->loadIconSet("fileclose",KIcon::Small).pixmap(TQIconSet::Small, false);
}
Images::~Images()
@@ -73,9 +73,9 @@ void Images::initializeLeds()
void Images::initializeKimifaceIcons()
{
- kimproxyAway = KGlobal::iconLoader()->loadIconSet("kimproxyaway",KIcon::Small);
- kimproxyOnline = KGlobal::iconLoader()->loadIconSet("kimproxyonline",KIcon::Small);
- kimproxyOffline = KGlobal::iconLoader()->loadIconSet("kimproxyoffline",KIcon::Small);
+ kimproxyAway = TDEGlobal::iconLoader()->loadIconSet("kimproxyaway",KIcon::Small);
+ kimproxyOnline = TDEGlobal::iconLoader()->loadIconSet("kimproxyonline",KIcon::Small);
+ kimproxyOffline = TDEGlobal::iconLoader()->loadIconSet("kimproxyoffline",KIcon::Small);
}
// NickIcons
@@ -84,10 +84,10 @@ void Images::initializeNickIcons()
{
TQString iconTheme = Preferences::iconTheme();
- TQStringList icons = KGlobal::dirs()->findAllResources("data","konversation/themes/"+iconTheme+"/*.png");
+ TQStringList icons = TDEGlobal::dirs()->findAllResources("data","konversation/themes/"+iconTheme+"/*.png");
if( icons.count() < 7 ) // Sanity
- icons = KGlobal::dirs()->findAllResources("data","konversation/themes/default/*.png");
+ icons = TDEGlobal::dirs()->findAllResources("data","konversation/themes/default/*.png");
icons.sort();
TQStringList::ConstIterator it = icons.begin();
@@ -137,8 +137,8 @@ void Images::initializeNickIcons()
void Images::updateIcons()
{
- m_closeIcon = KGlobal::iconLoader()->loadIcon("fileclose",KIcon::Small);
- m_disabledCloseIcon = KGlobal::iconLoader()->loadIconSet("fileclose",KIcon::Small).pixmap(TQIconSet::Small, false);
+ m_closeIcon = TDEGlobal::iconLoader()->loadIcon("fileclose",KIcon::Small);
+ m_disabledCloseIcon = TDEGlobal::iconLoader()->loadIconSet("fileclose",KIcon::Small).pixmap(TQIconSet::Small, false);
}
TQIconSet Images::getLed(TQColor col,bool state)
diff --git a/konversation/src/irccharsets.cpp b/konversation/src/irccharsets.cpp
index 692820c..5daf06d 100644
--- a/konversation/src/irccharsets.cpp
+++ b/konversation/src/irccharsets.cpp
@@ -56,7 +56,7 @@ namespace Konversation
TQString descriptiveNameToShortName( const TQString& descriptiveName )
{
- return KGlobal::charsets()->encodingForName( descriptiveName );
+ return TDEGlobal::charsets()->encodingForName( descriptiveName );
}
TQString IRCCharsets::ambiguousNameToShortName( const TQString& ambiguousName )
@@ -135,11 +135,11 @@ namespace Konversation
// setup m_shortNames, m_descriptiveNames, m_simplifiedShortNames
TQRegExp reSimplify( "[^a-zA-Z0-9]" );
- m_descriptiveNames = KGlobal::charsets()->descriptiveEncodingNames();
+ m_descriptiveNames = TDEGlobal::charsets()->descriptiveEncodingNames();
TQStringList::Iterator it = m_descriptiveNames.begin();
while ( it != m_descriptiveNames.end() )
{
- TQString encodingName = KGlobal::charsets()->encodingForName( *it );
+ TQString encodingName = TDEGlobal::charsets()->encodingForName( *it );
// exclude encodings which are not supported on IRC
if ( encodingName == "iso-10646-ucs-2" ||
encodingName == "ucs2" ||
diff --git a/konversation/src/ircview.cpp b/konversation/src/ircview.cpp
index 57ca95f..6ef0530 100644
--- a/konversation/src/ircview.cpp
+++ b/konversation/src/ircview.cpp
@@ -118,7 +118,7 @@ IRCView::IRCView(TQWidget* parent, Server* newServer) : KTextBrowser(parent)
if (Preferences::customTextFont())
setFont(Preferences::textFont());
else
- setFont(KGlobalSettings::generalFont());
+ setFont(TDEGlobalSettings::generalFont());
if (Preferences::useParagraphSpacing()) enableParagraphSpacing();
@@ -318,14 +318,14 @@ void IRCView::openLink(const TQString& url, bool newTab)
{
TQString cmd = Preferences::webBrowserCmd();
cmd.replace("%u", url);
- KProcess *proc = new KProcess;
+ TDEProcess *proc = new TDEProcess;
TQStringList cmdAndArgs = KShell::splitArgs(cmd);
*proc << cmdAndArgs;
// This code will also work, but starts an extra shell process.
// kdDebug() << "IRCView::urlClickSlot(): cmd = " << cmd << endl;
// *proc << cmd;
// proc->setUseShell(true);
- proc->start(KProcess::DontCare);
+ proc->start(TDEProcess::DontCare);
delete proc;
}
}
@@ -934,7 +934,7 @@ void IRCView::appendServerMessage(const TQString& type, const TQString& message,
if(Preferences::fixedMOTD() && !m_fontDataBase.isFixedPitch(font().family()))
{
if(type == i18n("MOTD"))
- fixed=" face=\"" + KGlobalSettings::fixedFont().family() + "\"";
+ fixed=" face=\"" + TDEGlobalSettings::fixedFont().family() + "\"";
}
TQString line;
@@ -1712,7 +1712,7 @@ TQString IRCView::timeStamp()
TQDate date = TQDate::currentDate();
timeString = TQString("<font color=\"" +
timeColor + "\">[%1 %2]</font> ")
- .arg(KGlobal::locale()->formatDate(date, true /*short format*/),
+ .arg(TDEGlobal::locale()->formatDate(date, true /*short format*/),
time.toString(timeFormat));
}
diff --git a/konversation/src/konversationmainwindow.cpp b/konversation/src/konversationmainwindow.cpp
index b42a742..db72205 100644
--- a/konversation/src/konversationmainwindow.cpp
+++ b/konversation/src/konversationmainwindow.cpp
@@ -498,7 +498,7 @@ void KonversationMainWindow::toggleMenubar(bool dontShowWarning)
int KonversationMainWindow::configureToolbar()
{
- saveMainWindowSettings(KGlobal::config());
+ saveMainWindowSettings(TDEGlobal::config());
KEditToolbar dlg(actionCollection(), xmlFile(), true, this);
connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(saveToolbarConfig()));
return dlg.exec();
@@ -507,7 +507,7 @@ int KonversationMainWindow::configureToolbar()
void KonversationMainWindow::saveToolbarConfig()
{
createGUI(xmlFile(), false);
- applyMainWindowSettings(KGlobal::config());
+ applyMainWindowSettings(TDEGlobal::config());
}
void KonversationMainWindow::focusAndShowErrorMessage(const TQString &errorMsg)
diff --git a/konversation/src/konvibookmarkhandler.cpp b/konversation/src/konvibookmarkhandler.cpp
index 5a76682..9002484 100644
--- a/konversation/src/konvibookmarkhandler.cpp
+++ b/konversation/src/konvibookmarkhandler.cpp
@@ -62,12 +62,12 @@ KonviBookmarkHandler::~KonviBookmarkHandler()
void KonviBookmarkHandler::slotEditBookmarks()
{
- KProcess proc;
+ TDEProcess proc;
proc << TQString::fromLatin1("keditbookmarks");
proc << "--nobrowser";
proc << "--caption" << i18n("Konversation Bookmarks Editor");
proc << m_file;
- proc.start(KProcess::DontCare);
+ proc.start(TDEProcess::DontCare);
}
void KonviBookmarkHandler::slotBookmarksChanged( const TQString &,
diff --git a/konversation/src/linkaddressbook/addressbook_base.cpp b/konversation/src/linkaddressbook/addressbook_base.cpp
index 3542b77..c2ba71b 100644
--- a/konversation/src/linkaddressbook/addressbook_base.cpp
+++ b/konversation/src/linkaddressbook/addressbook_base.cpp
@@ -384,7 +384,7 @@ namespace Konversation
// then call it on the command line to actually put it in edit mode. This is stupid :(
kapp->startServiceByDesktopName( "kaddressbook" );
- KProcess *proc = new KProcess;
+ TDEProcess *proc = new TDEProcess;
*proc << "kaddressbook";
*proc << "--editor-only" << "--uid" << uid;
kdDebug() << "running kaddressbook --editor-only --uid " << uid << endl;
diff --git a/konversation/src/nicksonline.cpp b/konversation/src/nicksonline.cpp
index 47a79e8..5549754 100644
--- a/konversation/src/nicksonline.cpp
+++ b/konversation/src/nicksonline.cpp
@@ -59,7 +59,7 @@ NicksOnline::NicksOnline(TQWidget* parent): ChatWindow(parent)
m_whoisRequested = true;
m_nickListView->addColumn(i18n("Network/Nickname/Channel"));
- m_kabcIconSet = KGlobal::iconLoader()->loadIconSet("kaddressbook",KIcon::Small);
+ m_kabcIconSet = TDEGlobal::iconLoader()->loadIconSet("kaddressbook",KIcon::Small);
m_nickListView->addColumn(i18n("Additional Information"));
m_nickListView->setFullWidth(true);
m_nickListView->setRootIsDecorated(true);
diff --git a/konversation/src/osd.cpp b/konversation/src/osd.cpp
index 30a075c..ec088a9 100644
--- a/konversation/src/osd.cpp
+++ b/konversation/src/osd.cpp
@@ -193,8 +193,8 @@ void OSDWidget::setBackgroundColor( const TQColor &newColor )
void OSDWidget::unsetColors()
{
- setPaletteForegroundColor( KGlobalSettings::activeTextColor() );
- setPaletteBackgroundColor( KGlobalSettings::activeTitleColor() );
+ setPaletteForegroundColor( TDEGlobalSettings::activeTextColor() );
+ setPaletteBackgroundColor( TDEGlobalSettings::activeTitleColor() );
refresh();
}
diff --git a/konversation/src/query.cpp b/konversation/src/query.cpp
index bc1cd7d..4854fdf 100644
--- a/konversation/src/query.cpp
+++ b/konversation/src/query.cpp
@@ -102,7 +102,7 @@ Query::Query(TQWidget* parent, TQString _name) : ChatWindow(parent)
awayLabel->hide();
blowfishLabel = new TQLabel(inputBox);
blowfishLabel->hide();
- blowfishLabel->setPixmap(KGlobal::iconLoader()->loadIcon("encrypted", KIcon::Toolbar));
+ blowfishLabel->setPixmap(TDEGlobal::iconLoader()->loadIcon("encrypted", KIcon::Toolbar));
queryInput=new IRCInput(inputBox);
getTextView()->installEventFilter(queryInput);
@@ -312,8 +312,8 @@ void Query::updateAppearance()
}
else
{
- getTextView()->setFont(KGlobalSettings::generalFont());
- queryInput->setFont(KGlobalSettings::generalFont());
+ getTextView()->setFont(TDEGlobalSettings::generalFont());
+ queryInput->setFont(TDEGlobalSettings::generalFont());
}
ChatWindow::updateAppearance();
diff --git a/konversation/src/rawlog.cpp b/konversation/src/rawlog.cpp
index bb3d65f..79150b9 100644
--- a/konversation/src/rawlog.cpp
+++ b/konversation/src/rawlog.cpp
@@ -57,7 +57,7 @@ void RawLog::updateAppearance()
if (Preferences::customTextFont())
getTextView()->setFont(Preferences::textFont());
else
- getTextView()->setFont(KGlobalSettings::generalFont());
+ getTextView()->setFont(TDEGlobalSettings::generalFont());
ChatWindow::updateAppearance();
}
diff --git a/konversation/src/scriptlauncher.cpp b/konversation/src/scriptlauncher.cpp
index 3c24056..4353474 100644
--- a/konversation/src/scriptlauncher.cpp
+++ b/konversation/src/scriptlauncher.cpp
@@ -39,7 +39,7 @@ void ScriptLauncher::launchScript(const TQString& target, const TQString &parame
{
KStandardDirs kstddir;
// TQString scriptPath(kstddir.saveLocation("data",TQString("konversation/scripts")));
- KProcess process;
+ TDEProcess process;
// send the script all the information it will need
TQStringList parameterList=TQStringList::split(' ',parameter);
diff --git a/konversation/src/server.cpp b/konversation/src/server.cpp
index 4c1cc6f..e4fed1c 100644
--- a/konversation/src/server.cpp
+++ b/konversation/src/server.cpp
@@ -203,7 +203,7 @@ void Server::doPreShellCommand()
TQString command = getIdentity()->getShellCommand();
getStatusView()->appendServerMessage(i18n("Info"),"Running preconfigured command...");
- connect(&m_preShellCommand,TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(preShellCommandExited(KProcess*)));
+ connect(&m_preShellCommand,TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(preShellCommandExited(TDEProcess*)));
TQStringList commandList = TQStringList::split(" ",command);
@@ -359,7 +359,7 @@ void Server::setAutoJoin(bool on)
m_autoJoin = on;
}
-void Server::preShellCommandExited(KProcess* proc)
+void Server::preShellCommandExited(TDEProcess* proc)
{
if (proc && proc->normalExit())
diff --git a/konversation/src/server.h b/konversation/src/server.h
index 086c9dd..35e9ac2 100644
--- a/konversation/src/server.h
+++ b/konversation/src/server.h
@@ -474,7 +474,7 @@ void resetNickSelection();
protected slots:
void lookupFinished();
- void preShellCommandExited(KProcess*);
+ void preShellCommandExited(TDEProcess*);
void ircServerConnectionSuccess();
void startAwayTimer();
void incoming();
@@ -669,7 +669,7 @@ void resetNickSelection();
ScriptLauncher* m_scriptLauncher;
- KProcess m_preShellCommand;
+ TDEProcess m_preShellCommand;
private:
/// Helper object to construct ISON (notify) list and map offline nicks to
diff --git a/konversation/src/statuspanel.cpp b/konversation/src/statuspanel.cpp
index 9915731..031a845 100644
--- a/konversation/src/statuspanel.cpp
+++ b/konversation/src/statuspanel.cpp
@@ -193,9 +193,9 @@ void StatusPanel::updateAppearance()
}
else
{
- getTextView()->setFont(KGlobalSettings::generalFont());
- statusInput->setFont(KGlobalSettings::generalFont());
- nicknameCombobox->setFont(KGlobalSettings::generalFont());
+ getTextView()->setFont(TDEGlobalSettings::generalFont());
+ statusInput->setFont(TDEGlobalSettings::generalFont());
+ nicknameCombobox->setFont(TDEGlobalSettings::generalFont());
}
showNicknameBox(Preferences::showNicknameBox());
diff --git a/konversation/src/theme_preferences.cpp b/konversation/src/theme_preferences.cpp
index 1b052fd..c2d2d8f 100644
--- a/konversation/src/theme_preferences.cpp
+++ b/konversation/src/theme_preferences.cpp
@@ -73,7 +73,7 @@ void Theme_Config::loadSettings()
int currentThemeIndex = 0;
// get list of theme dirs
- m_dirs = KGlobal::dirs()->findAllResources("data","konversation/themes/*/index.desktop");
+ m_dirs = TDEGlobal::dirs()->findAllResources("data","konversation/themes/*/index.desktop");
// if we have any themes
if(m_dirs.count() > 0)
diff --git a/konversation/src/topiclabel.cpp b/konversation/src/topiclabel.cpp
index 7b52690..75e9500 100644
--- a/konversation/src/topiclabel.cpp
+++ b/konversation/src/topiclabel.cpp
@@ -152,14 +152,14 @@ namespace Konversation
{
TQString cmd = Preferences::webBrowserCmd();
cmd.replace("%u",KURL::fromPathOrURL(link).url());
- KProcess *proc = new KProcess;
+ TDEProcess *proc = new TDEProcess;
TQStringList cmdAndArgs = KShell::splitArgs(cmd);
*proc << cmdAndArgs;
// This code will also work, but starts an extra shell process.
// kdDebug() << "IRCView::linkClickSlot(): cmd = " << cmd << endl;
// *proc << cmd;
// proc->setUseShell(true);
- proc->start(KProcess::DontCare);
+ proc->start(TDEProcess::DontCare);
delete proc;
}
}
diff --git a/konversation/src/urlcatcher.cpp b/konversation/src/urlcatcher.cpp
index 306f468..f1ec356 100644
--- a/konversation/src/urlcatcher.cpp
+++ b/konversation/src/urlcatcher.cpp
@@ -144,14 +144,14 @@ void UrlCatcher::openUrl(TQListViewItem* item)
{
TQString cmd = Preferences::webBrowserCmd();
cmd.replace("%u", url);
- KProcess *proc = new KProcess;
+ TDEProcess *proc = new TDEProcess;
TQStringList cmdAndArgs = KShell::splitArgs(cmd);
*proc << cmdAndArgs;
// This code will also work, but starts an extra shell process.
// kdDebug() << "UrlCatcher::openUrl(): cmd = " << cmd << endl;
// *proc << cmd;
// proc->setUseShell(true);
- proc->start(KProcess::DontCare);
+ proc->start(TDEProcess::DontCare);
delete proc;
}
}
diff --git a/konversation/src/viewcontainer.cpp b/konversation/src/viewcontainer.cpp
index 7210ae8..bb77ac1 100644
--- a/konversation/src/viewcontainer.cpp
+++ b/konversation/src/viewcontainer.cpp
@@ -64,7 +64,7 @@ ViewContainer::ViewContainer(KonversationMainWindow* window):
m_queryViewCount = 0;
m_viewTreeSplitter = new TQSplitter(m_window, "view_tree_splitter");
- m_viewTreeSplitter->setOpaqueResize(KGlobalSettings::opaqueResize());
+ m_viewTreeSplitter->setOpaqueResize(TDEGlobalSettings::opaqueResize());
m_saveSplitterSizesLock = true;
// The tree needs to be initialized before the tab widget so that it
@@ -155,7 +155,7 @@ void ViewContainer::setupTabWidget()
m_vbox->hide(); //m_tabWidget->hide();
KPushButton* closeBtn = new KPushButton(m_tabWidget);
- closeBtn->setPixmap(KGlobal::iconLoader()->loadIcon("tab_remove", KIcon::Small));
+ closeBtn->setPixmap(TDEGlobal::iconLoader()->loadIcon("tab_remove", KIcon::Small));
closeBtn->resize(22, 22);
closeBtn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
m_tabWidget->setCornerWidget(closeBtn);
@@ -363,7 +363,7 @@ void ViewContainer::updateAppearance()
if (Preferences::customTextFont())
font = Preferences::textFont();
else
- font = KGlobalSettings::generalFont();
+ font = TDEGlobalSettings::generalFont();
m_insertCharDialog->setFont(font);
}
@@ -378,7 +378,7 @@ void ViewContainer::updateTabWidgetAppearance()
if (Preferences::customTabFont())
m_tabWidget->setFont(Preferences::tabFont());
else
- m_tabWidget->setFont(KGlobalSettings::generalFont());
+ m_tabWidget->setFont(TDEGlobalSettings::generalFont());
m_tabWidget->setTabPosition((Preferences::tabPlacement()==PreferencesBase::Top) ?
TQTabWidget::Top : TQTabWidget::Bottom);
@@ -1855,7 +1855,7 @@ void ViewContainer::insertCharacter()
if (Preferences::customTextFont())
font = Preferences::textFont();
else
- font = KGlobalSettings::generalFont();
+ font = TDEGlobalSettings::generalFont();
if (!m_insertCharDialog)
{
diff --git a/konversation/src/viewtree.cpp b/konversation/src/viewtree.cpp
index 5e9131c..79f6209 100644
--- a/konversation/src/viewtree.cpp
+++ b/konversation/src/viewtree.cpp
@@ -112,7 +112,7 @@ void ViewTree::updateAppearance()
if (Preferences::customTabFont())
setFont(Preferences::tabFont());
else
- setFont(KGlobalSettings::generalFont());
+ setFont(TDEGlobalSettings::generalFont());
TQColor fg, bg;
@@ -123,8 +123,8 @@ void ViewTree::updateAppearance()
}
else
{
- bg = KGlobalSettings::baseColor();
- fg = KGlobalSettings::textColor();
+ bg = TDEGlobalSettings::baseColor();
+ fg = TDEGlobalSettings::textColor();
}
setPalette(TDEApplication::palette());
@@ -957,7 +957,7 @@ void ViewTree::paintEmptyArea(TQPainter* p, const TQRect& rect)
return;
TQColor bgColor = paletteBackgroundColor();
- TQColor selColor = KGlobalSettings::highlightColor();
+ TQColor selColor = TDEGlobalSettings::highlightColor();
TQColor midColor = last->mixColor(bgColor, selColor);
p->setPen(selColor);
diff --git a/konversation/src/viewtreeitem.cpp b/konversation/src/viewtreeitem.cpp
index 2839366..4822ce5 100644
--- a/konversation/src/viewtreeitem.cpp
+++ b/konversation/src/viewtreeitem.cpp
@@ -37,7 +37,7 @@ ViewTreeItem::ViewTreeItem(TQListView* parent, const TQString& name, ChatWindow*
setView(view);
setViewType(view->getType());
- m_color = KGlobalSettings::textColor();
+ m_color = TDEGlobalSettings::textColor();
m_customColorSet = false;
setOpen(true);
@@ -66,7 +66,7 @@ ViewTreeItem::ViewTreeItem(TQListViewItem* parent, const TQString& name, ChatWin
setView(view);
setViewType(view->getType());
- m_color = KGlobalSettings::textColor();
+ m_color = TDEGlobalSettings::textColor();
m_customColorSet = false;
setOpen(true);
@@ -91,7 +91,7 @@ ViewTreeItem::ViewTreeItem(TQListViewItem* parent, TQListViewItem* afterItem, co
setView(view);
setViewType(view->getType());
- m_color = KGlobalSettings::textColor();
+ m_color = TDEGlobalSettings::textColor();
m_customColorSet = false;
setOpen(true);
@@ -184,7 +184,7 @@ TQColor ViewTreeItem::getColor() const
if (Preferences::inputFieldsBackgroundColor())
return Preferences::color(Preferences::ChannelMessage);
else
- return KGlobalSettings::textColor();
+ return TDEGlobalSettings::textColor();
}
else
return m_color;
@@ -341,16 +341,16 @@ void ViewTreeItem::paintCell(TQPainter* p, const TQColorGroup& /* cg */, int /*
TQPixmap buffer(width, height());
TQPainter painter(&buffer);
- TQColor textColor = isSelected() ? KGlobalSettings::highlightedTextColor() : getColor();
- TQColor background = isSelected() ? KGlobalSettings::highlightColor() : listView()->paletteBackgroundColor();
+ TQColor textColor = isSelected() ? TDEGlobalSettings::highlightedTextColor() : getColor();
+ TQColor background = isSelected() ? TDEGlobalSettings::highlightColor() : listView()->paletteBackgroundColor();
if (m_isHighlighted) background = Preferences::inputFieldsBackgroundColor()
- ? Preferences::color(Preferences::AlternateBackground) : KGlobalSettings::alternateBackgroundColor();
+ ? Preferences::color(Preferences::AlternateBackground) : TDEGlobalSettings::alternateBackgroundColor();
// Fill in background.
painter.fillRect(0, 0, width, height(), background);
TQColor bgColor = listView()->paletteBackgroundColor();
- TQColor selColor = m_isHighlighted ? background : KGlobalSettings::highlightColor();
+ TQColor selColor = m_isHighlighted ? background : TDEGlobalSettings::highlightColor();
TQColor midColor = mixColor(bgColor, selColor);
int iconWidth = pixmap(0) ? LED_ICON_SIZE : 0;
@@ -411,7 +411,7 @@ void ViewTreeItem::paintCell(TQPainter* p, const TQColorGroup& /* cg */, int /*
if (m_isHighlighted)
{
- selColor = KGlobalSettings::highlightColor();
+ selColor = TDEGlobalSettings::highlightColor();
midColor = mixColor(bgColor, selColor);
}
@@ -479,7 +479,7 @@ void ViewTreeItem::paintCell(TQPainter* p, const TQColorGroup& /* cg */, int /*
else
{
TQColor lineColor = Preferences::inputFieldsBackgroundColor()
- ? Preferences::color(Preferences::AlternateBackground) : KGlobalSettings::alternateBackgroundColor();
+ ? Preferences::color(Preferences::AlternateBackground) : TDEGlobalSettings::alternateBackgroundColor();
painter.setPen(lineColor);
painter.drawLine(0, 5, width, 5);
}