TDE
/
konversation
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/konversation
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent 3a040438b0
commit 4d6cade4fd
32 changed files with 98 additions and 98 deletions
Show Stats Download Patch File Download Diff File

20
konversation/src/channel.cpp
Unescape View File

@ -115,7 +115,7 @@ Channel::Channel(TQWidget* parent, TQString _name) : ChatWindow(parent)
TQSizePolicy greedy = TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); TQSizePolicy greedy = TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
m_vertSplitter = new TQSplitter(Qt::Vertical, this); m_vertSplitter = new TQSplitter(Qt::Vertical, this);
m_vertSplitter->setOpaqueResize(KGlobalSettings::opaqueResize()); m_vertSplitter->setOpaqueResize(TDEGlobalSettings::opaqueResize());
TQWidget* topicWidget = new TQWidget(m_vertSplitter); 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 // (this) The main Box, holding the channel view/topic and the input line
m_horizSplitter = new TQSplitter(m_vertSplitter); m_horizSplitter = new TQSplitter(m_vertSplitter);
m_horizSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() ); m_horizSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
// Server will be set later in setServer() // Server will be set later in setServer()
IRCViewBox* ircViewBox = new IRCViewBox(m_horizSplitter, NULL); IRCViewBox* ircViewBox = new IRCViewBox(m_horizSplitter, NULL);
@ -232,7 +232,7 @@ Channel::Channel(TQWidget* parent, TQString _name) : ChatWindow(parent)
awayLabel->hide(); awayLabel->hide();
blowfishLabel = new TQLabel(commandLineBox); blowfishLabel = new TQLabel(commandLineBox);
blowfishLabel->hide(); blowfishLabel->hide();
blowfishLabel->setPixmap(KGlobal::iconLoader()->loadIcon("encrypted", KIcon::Toolbar)); blowfishLabel->setPixmap(TDEGlobal::iconLoader()->loadIcon("encrypted", KIcon::Toolbar));
channelInput = new IRCInput(commandLineBox); channelInput = new IRCInput(commandLineBox);
getTextView()->installEventFilter(channelInput); getTextView()->installEventFilter(channelInput);
@ -2255,7 +2255,7 @@ void Channel::updateAppearance()
{ {
fg=colorGroup().foreground(); fg=colorGroup().foreground();
bg=colorGroup().base(); bg=colorGroup().base();
abg=KGlobalSettings::alternateBackgroundColor(); abg=TDEGlobalSettings::alternateBackgroundColor();
} }
channelInput->unsetPalette(); channelInput->unsetPalette();
@ -2289,11 +2289,11 @@ void Channel::updateAppearance()
} }
else else
{ {
getTextView()->setFont(KGlobalSettings::generalFont()); getTextView()->setFont(TDEGlobalSettings::generalFont());
topicLine->setFont(KGlobalSettings::generalFont()); topicLine->setFont(TDEGlobalSettings::generalFont());
channelInput->setFont(KGlobalSettings::generalFont()); channelInput->setFont(TDEGlobalSettings::generalFont());
nicknameCombobox->setFont(KGlobalSettings::generalFont()); nicknameCombobox->setFont(TDEGlobalSettings::generalFont());
limit->setFont(KGlobalSettings::generalFont()); limit->setFont(TDEGlobalSettings::generalFont());
} }
nicknameListView->resort(); nicknameListView->resort();
@ -2305,7 +2305,7 @@ void Channel::updateAppearance()
if (Preferences::customListFont()) if (Preferences::customListFont())
nicknameListView->setFont(Preferences::listFont()); nicknameListView->setFont(Preferences::listFont());
else else
nicknameListView->setFont(KGlobalSettings::generalFont()); nicknameListView->setFont(TDEGlobalSettings::generalFont());
nicknameListView->refresh(); nicknameListView->refresh();

2
konversation/src/channeloptionsdialog.cpp
Unescape View File

@ -496,7 +496,7 @@ namespace Konversation
TQString BanListViewItem::text(int column) const TQString BanListViewItem::text(int column) const
{ {
if (column == 2) if (column == 2)
return KGlobal::locale()->formatDateTime(m_timestamp, true, true); return TDEGlobal::locale()->formatDateTime(m_timestamp, true, true);
return KListViewItem::text(column); return KListViewItem::text(column);
} }

4
konversation/src/chatwindow.cpp
Unescape View File

@ -47,7 +47,7 @@ ChatWindow::ChatWindow(TQWidget* parent) : TQVBox(parent)
// The font size of the KTabWidget container may be inappropriately // The font size of the KTabWidget container may be inappropriately
// small due to the "Tab bar" font size setting. // small due to the "Tab bar" font size setting.
setFont(KGlobalSettings::generalFont()); setFont(TDEGlobalSettings::generalFont());
} }
ChatWindow::~ChatWindow() ChatWindow::~ChatWindow()
@ -60,7 +60,7 @@ void ChatWindow::updateAppearance()
{ {
// The font size of the KTabWidget container may be inappropriately // The font size of the KTabWidget container may be inappropriately
// small due to the "Tab bar" font size setting. // small due to the "Tab bar" font size setting.
setFont(KGlobalSettings::generalFont()); setFont(TDEGlobalSettings::generalFont());
if (textView) if (textView)
{ {

8
konversation/src/config/konversation.kcfg
Unescape View File

@ -31,17 +31,17 @@
<whatsthis></whatsthis> <whatsthis></whatsthis>
</entry> </entry>
<entry key="TextFont" type="Font"> <entry key="TextFont" type="Font">
<default code="true">KGlobalSettings::generalFont()</default> <default code="true">TDEGlobalSettings::generalFont()</default>
<label></label> <label></label>
<whatsthis></whatsthis> <whatsthis></whatsthis>
</entry> </entry>
<entry key="ListFont" type="Font"> <entry key="ListFont" type="Font">
<default code="true">KGlobalSettings::generalFont()</default> <default code="true">TDEGlobalSettings::generalFont()</default>
<label></label> <label></label>
<whatsthis></whatsthis> <whatsthis></whatsthis>
</entry> </entry>
<entry key="TabFont" type="Font"> <entry key="TabFont" type="Font">
<default code="true">KGlobalSettings::generalFont()</default> <default code="true">TDEGlobalSettings::generalFont()</default>
<label></label> <label></label>
<whatsthis></whatsthis> <whatsthis></whatsthis>
</entry> </entry>
@ -476,7 +476,7 @@
<whatsthis></whatsthis> <whatsthis></whatsthis>
</entry> </entry>
<entry key="OSDFont" type="Font"> <entry key="OSDFont" type="Font">
<default code="true">KGlobalSettings::generalFont()</default> <default code="true">TDEGlobalSettings::generalFont()</default>
<label></label> <label></label>
<whatsthis></whatsthis> <whatsthis></whatsthis>
</entry> </entry>

2
konversation/src/config/preferences.cpp
Unescape View File

@ -443,7 +443,7 @@ const IdentityPtr Preferences::identityById(int id)
TQStringList Preferences::defaultAliasList() TQStringList Preferences::defaultAliasList()
{ {
// Auto-alias scripts // Auto-alias scripts
TQStringList scripts = KGlobal::dirs()->findAllResources("data","konversation/scripts/*"); TQStringList scripts = TDEGlobal::dirs()->findAllResources("data","konversation/scripts/*");
TQFileInfo* fileInfo = new TQFileInfo(); TQFileInfo* fileInfo = new TQFileInfo();
TQStringList aliasList; TQStringList aliasList;
TQString newAlias; TQString newAlias;

4
konversation/src/dccchat.cpp
Unescape View File

@ -463,8 +463,8 @@ void DccChat::updateAppearance()
} }
else else
{ {
getTextView()->setFont(KGlobalSettings::generalFont()); getTextView()->setFont(TDEGlobalSettings::generalFont());
m_dccChatInput->setFont(KGlobalSettings::generalFont()); m_dccChatInput->setFont(TDEGlobalSettings::generalFont());
} }
ChatWindow::updateAppearance(); ChatWindow::updateAppearance();

6
konversation/src/dcctransferdetailedinfopanel.cpp
Unescape View File

@ -120,10 +120,10 @@ void DccTransferDetailedInfoPanel::updateView()
m_progress->setProgress( transfer->getProgress() ); m_progress->setProgress( transfer->getProgress() );
// Current Position: // Current Position:
m_labelCurrentPosition->setText( KGlobal::locale()->formatNumber( transfer->getTransferringPosition(), 0 ) ); m_labelCurrentPosition->setText( TDEGlobal::locale()->formatNumber( transfer->getTransferringPosition(), 0 ) );
// File Size: // File Size:
m_labelFileSize->setText( KGlobal::locale()->formatNumber( transfer->getFileSize(), 0 ) ); m_labelFileSize->setText( TDEGlobal::locale()->formatNumber( transfer->getFileSize(), 0 ) );
// Current Speed: // Current Speed:
m_labelCurrentSpeed->setText( m_item->getCurrentSpeedPrettyText() ); m_labelCurrentSpeed->setText( m_item->getCurrentSpeedPrettyText() );
@ -133,7 +133,7 @@ void DccTransferDetailedInfoPanel::updateView()
// Resumed: // Resumed:
if ( transfer->isResumed() ) 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 else
m_labelIsResumed->setText( i18n( "No" ) ); m_labelIsResumed->setText( i18n( "No" ) );

2
konversation/src/dcctransferpanel.cpp
Unescape View File

@ -110,7 +110,7 @@ void DccTransferPanel::initGUI()
buttonsBox->setSpacing(spacing()); buttonsBox->setSpacing(spacing());
// convenience, undeffed below again to avoid name clashes // 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_buttonAccept = new TQPushButton(icon("player_play"), i18n("Accept"), buttonsBox, "start_dcc");
m_buttonAbort = new TQPushButton(icon("stop"), i18n("Abort"), buttonsBox, "abort_dcc"); m_buttonAbort = new TQPushButton(icon("stop"), i18n("Abort"), buttonsBox, "abort_dcc");

10
konversation/src/dcctransferpanelitem.cpp
Unescape View File

@ -270,9 +270,9 @@ TQString DccTransferPanelItem::getTypeText() const
TQPixmap DccTransferPanelItem::getTypeIcon() const TQPixmap DccTransferPanelItem::getTypeIcon() const
{ {
if ( m_transfer->getType() == DccTransfer::Send ) if ( m_transfer->getType() == DccTransfer::Send )
return KGlobal::iconLoader()->loadIcon( "up", KIcon::Small ); return TDEGlobal::iconLoader()->loadIcon( "up", KIcon::Small );
else else
return KGlobal::iconLoader()->loadIcon( "down", KIcon::Small ); return TDEGlobal::iconLoader()->loadIcon( "down", KIcon::Small );
} }
TQPixmap DccTransferPanelItem::getStatusIcon() const TQPixmap DccTransferPanelItem::getStatusIcon() const
@ -301,7 +301,7 @@ TQPixmap DccTransferPanelItem::getStatusIcon() const
default: default:
break; break;
} }
return KGlobal::iconLoader()->loadIcon( icon, KIcon::Small ); return TDEGlobal::iconLoader()->loadIcon( icon, KIcon::Small );
} }
TQString DccTransferPanelItem::getStatusText() const TQString DccTransferPanelItem::getStatusText() const
@ -339,8 +339,8 @@ TQString DccTransferPanelItem::getFileSizePrettyText() const
TQString DccTransferPanelItem::getPositionPrettyText( bool detailed ) const TQString DccTransferPanelItem::getPositionPrettyText( bool detailed ) const
{ {
if ( detailed ) if ( detailed )
return KGlobal::locale()->formatNumber( m_transfer->getTransferringPosition(), 0 ) + " / " + return TDEGlobal::locale()->formatNumber( m_transfer->getTransferringPosition(), 0 ) + " / " +
KGlobal::locale()->formatNumber( m_transfer->getFileSize(), 0 ); TDEGlobal::locale()->formatNumber( m_transfer->getFileSize(), 0 );
else else
return KIO::convertSize( m_transfer->getTransferringPosition() ) + " / " + KIO::convertSize( m_transfer->getFileSize() ); return KIO::convertSize( m_transfer->getTransferringPosition() ) + " / " + KIO::convertSize( m_transfer->getFileSize() );
} }

4
konversation/src/dcctransferrecv.cpp
Unescape View File

@ -83,7 +83,7 @@ TQString DccTransferRecv::getTypeText() const
TQPixmap DccTransferRecv::getTypeIcon() const TQPixmap DccTransferRecv::getTypeIcon() const
{ {
return KGlobal::iconLoader()->loadIcon( "down", KIcon::Small ); return TDEGlobal::iconLoader()->loadIcon( "down", KIcon::Small );
} }
void DccTransferRecv::cleanUp() void DccTransferRecv::cleanUp()
@ -366,7 +366,7 @@ void DccTransferRecv::slotLocalCanResume( KIO::Job* job, KIO::filesize_t size )
"%1<br>" "%1<br>"
"Size of the partial file: %2 bytes<br>" ) "Size of the partial file: %2 bytes<br>" )
.arg( m_fileURL.prettyURL() ) .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 | DccResumeDialog::RA_Overwrite | DccResumeDialog::RA_Rename | DccResumeDialog::RA_Cancel,
DccResumeDialog::RA_Resume, DccResumeDialog::RA_Resume,
size ); size );

8
konversation/src/emoticon.cpp
Unescape View File

@ -66,16 +66,16 @@ namespace Konversation
} }
#if KDE_IS_VERSION(3,3,91) #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; self()->m_themeName = themeName;
#else #else
TQString app = "konversation"; 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()) if(filename.isEmpty())
{ {
app = "kopete"; 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; self()->m_themeName = app + '/' + themeName;
#endif #endif
@ -174,7 +174,7 @@ namespace Konversation
// Copyright (c) 2002 by Stefan Gehn <metz AT gehn.net> // Copyright (c) 2002 by Stefan Gehn <metz AT gehn.net>
// Copyright (c) 2002 by Olivier Goffart <ogoffart@tiscalinet.be> // Copyright (c) 2002 by Olivier Goffart <ogoffart@tiscalinet.be>
// //
KStandardDirs *dirs = KGlobal::dirs(); KStandardDirs *dirs = TDEGlobal::dirs();
TQString pic; TQString pic;
#if KDE_IS_VERSION(3,3,91) #if KDE_IS_VERSION(3,3,91)

4
konversation/src/highlight_preferences.cpp
Unescape View File

@ -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] // This code was copied from KNotifyWidget::openSoundDialog() (knotifydialog.cpp) [it's under LGPL v2]
// find the first "sound"-resource that contains files // find the first "sound"-resource that contains files
TQStringList soundDirs = KGlobal::dirs()->findDirs("data", "konversation/sounds"); TQStringList soundDirs = TDEGlobal::dirs()->findDirs("data", "konversation/sounds");
soundDirs += KGlobal::dirs()->resourceDirs( "sound" ); soundDirs += TDEGlobal::dirs()->resourceDirs( "sound" );
if ( !soundDirs.isEmpty() ) { if ( !soundDirs.isEmpty() ) {
KURL url; KURL url;

18
konversation/src/images.cpp
Unescape View File

@ -31,8 +31,8 @@ Images::Images()
initializeNickIcons(); initializeNickIcons();
initializeKimifaceIcons(); initializeKimifaceIcons();
m_closeIcon = KGlobal::iconLoader()->loadIcon("fileclose",KIcon::Small); m_closeIcon = TDEGlobal::iconLoader()->loadIcon("fileclose",KIcon::Small);
m_disabledCloseIcon = KGlobal::iconLoader()->loadIconSet("fileclose",KIcon::Small).pixmap(TQIconSet::Small, false); m_disabledCloseIcon = TDEGlobal::iconLoader()->loadIconSet("fileclose",KIcon::Small).pixmap(TQIconSet::Small, false);
} }
Images::~Images() Images::~Images()
@ -73,9 +73,9 @@ void Images::initializeLeds()
void Images::initializeKimifaceIcons() void Images::initializeKimifaceIcons()
{ {
kimproxyAway = KGlobal::iconLoader()->loadIconSet("kimproxyaway",KIcon::Small); kimproxyAway = TDEGlobal::iconLoader()->loadIconSet("kimproxyaway",KIcon::Small);
kimproxyOnline = KGlobal::iconLoader()->loadIconSet("kimproxyonline",KIcon::Small); kimproxyOnline = TDEGlobal::iconLoader()->loadIconSet("kimproxyonline",KIcon::Small);
kimproxyOffline = KGlobal::iconLoader()->loadIconSet("kimproxyoffline",KIcon::Small); kimproxyOffline = TDEGlobal::iconLoader()->loadIconSet("kimproxyoffline",KIcon::Small);
} }
// NickIcons // NickIcons
@ -84,10 +84,10 @@ void Images::initializeNickIcons()
{ {
TQString iconTheme = Preferences::iconTheme(); 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 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(); icons.sort();
TQStringList::ConstIterator it = icons.begin(); TQStringList::ConstIterator it = icons.begin();
@ -137,8 +137,8 @@ void Images::initializeNickIcons()
void Images::updateIcons() void Images::updateIcons()
{ {
m_closeIcon = KGlobal::iconLoader()->loadIcon("fileclose",KIcon::Small); m_closeIcon = TDEGlobal::iconLoader()->loadIcon("fileclose",KIcon::Small);
m_disabledCloseIcon = KGlobal::iconLoader()->loadIconSet("fileclose",KIcon::Small).pixmap(TQIconSet::Small, false); m_disabledCloseIcon = TDEGlobal::iconLoader()->loadIconSet("fileclose",KIcon::Small).pixmap(TQIconSet::Small, false);
} }
TQIconSet Images::getLed(TQColor col,bool state) TQIconSet Images::getLed(TQColor col,bool state)

6
konversation/src/irccharsets.cpp
Unescape View File

@ -56,7 +56,7 @@ namespace Konversation
TQString descriptiveNameToShortName( const TQString& descriptiveName ) TQString descriptiveNameToShortName( const TQString& descriptiveName )
{ {
return KGlobal::charsets()->encodingForName( descriptiveName ); return TDEGlobal::charsets()->encodingForName( descriptiveName );
} }
TQString IRCCharsets::ambiguousNameToShortName( const TQString& ambiguousName ) TQString IRCCharsets::ambiguousNameToShortName( const TQString& ambiguousName )
@ -135,11 +135,11 @@ namespace Konversation
// setup m_shortNames, m_descriptiveNames, m_simplifiedShortNames // setup m_shortNames, m_descriptiveNames, m_simplifiedShortNames
TQRegExp reSimplify( "[^a-zA-Z0-9]" ); TQRegExp reSimplify( "[^a-zA-Z0-9]" );
m_descriptiveNames = KGlobal::charsets()->descriptiveEncodingNames(); m_descriptiveNames = TDEGlobal::charsets()->descriptiveEncodingNames();
TQStringList::Iterator it = m_descriptiveNames.begin(); TQStringList::Iterator it = m_descriptiveNames.begin();
while ( it != m_descriptiveNames.end() ) 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 // exclude encodings which are not supported on IRC
if ( encodingName == "iso-10646-ucs-2" || if ( encodingName == "iso-10646-ucs-2" ||
encodingName == "ucs2" || encodingName == "ucs2" ||

10
konversation/src/ircview.cpp
Unescape View File

@ -118,7 +118,7 @@ IRCView::IRCView(TQWidget* parent, Server* newServer) : KTextBrowser(parent)
if (Preferences::customTextFont()) if (Preferences::customTextFont())
setFont(Preferences::textFont()); setFont(Preferences::textFont());
else else
setFont(KGlobalSettings::generalFont()); setFont(TDEGlobalSettings::generalFont());
if (Preferences::useParagraphSpacing()) enableParagraphSpacing(); if (Preferences::useParagraphSpacing()) enableParagraphSpacing();
@ -318,14 +318,14 @@ void IRCView::openLink(const TQString& url, bool newTab)
{ {
TQString cmd = Preferences::webBrowserCmd(); TQString cmd = Preferences::webBrowserCmd();
cmd.replace("%u", url); cmd.replace("%u", url);
KProcess *proc = new KProcess; TDEProcess *proc = new TDEProcess;
TQStringList cmdAndArgs = KShell::splitArgs(cmd); TQStringList cmdAndArgs = KShell::splitArgs(cmd);
*proc << cmdAndArgs; *proc << cmdAndArgs;
// This code will also work, but starts an extra shell process. // This code will also work, but starts an extra shell process.
// kdDebug() << "IRCView::urlClickSlot(): cmd = " << cmd << endl; // kdDebug() << "IRCView::urlClickSlot(): cmd = " << cmd << endl;
// *proc << cmd; // *proc << cmd;
// proc->setUseShell(true); // proc->setUseShell(true);
proc->start(KProcess::DontCare); proc->start(TDEProcess::DontCare);
delete proc; delete proc;
} }
} }
@ -934,7 +934,7 @@ void IRCView::appendServerMessage(const TQString& type, const TQString& message,
if(Preferences::fixedMOTD() && !m_fontDataBase.isFixedPitch(font().family())) if(Preferences::fixedMOTD() && !m_fontDataBase.isFixedPitch(font().family()))
{ {
if(type == i18n("MOTD")) if(type == i18n("MOTD"))
fixed=" face=\"" + KGlobalSettings::fixedFont().family() + "\""; fixed=" face=\"" + TDEGlobalSettings::fixedFont().family() + "\"";
} }
TQString line; TQString line;
@ -1712,7 +1712,7 @@ TQString IRCView::timeStamp()
TQDate date = TQDate::currentDate(); TQDate date = TQDate::currentDate();
timeString = TQString("<font color=\"" + timeString = TQString("<font color=\"" +
timeColor + "\">[%1 %2]</font> ") timeColor + "\">[%1 %2]</font> ")
.arg(KGlobal::locale()->formatDate(date, true /*short format*/), .arg(TDEGlobal::locale()->formatDate(date, true /*short format*/),
time.toString(timeFormat)); time.toString(timeFormat));
} }

4
konversation/src/konversationmainwindow.cpp
Unescape View File

@ -498,7 +498,7 @@ void KonversationMainWindow::toggleMenubar(bool dontShowWarning)
int KonversationMainWindow::configureToolbar() int KonversationMainWindow::configureToolbar()
{ {
saveMainWindowSettings(KGlobal::config()); saveMainWindowSettings(TDEGlobal::config());
KEditToolbar dlg(actionCollection(), xmlFile(), true, this); KEditToolbar dlg(actionCollection(), xmlFile(), true, this);
connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(saveToolbarConfig())); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(saveToolbarConfig()));
return dlg.exec(); return dlg.exec();
@ -507,7 +507,7 @@ int KonversationMainWindow::configureToolbar()
void KonversationMainWindow::saveToolbarConfig() void KonversationMainWindow::saveToolbarConfig()
{ {
createGUI(xmlFile(), false); createGUI(xmlFile(), false);
applyMainWindowSettings(KGlobal::config()); applyMainWindowSettings(TDEGlobal::config());
} }
void KonversationMainWindow::focusAndShowErrorMessage(const TQString &errorMsg) void KonversationMainWindow::focusAndShowErrorMessage(const TQString &errorMsg)

4
konversation/src/konvibookmarkhandler.cpp
Unescape View File

@ -62,12 +62,12 @@ KonviBookmarkHandler::~KonviBookmarkHandler()
void KonviBookmarkHandler::slotEditBookmarks() void KonviBookmarkHandler::slotEditBookmarks()
{ {
KProcess proc; TDEProcess proc;
proc << TQString::fromLatin1("keditbookmarks"); proc << TQString::fromLatin1("keditbookmarks");
proc << "--nobrowser"; proc << "--nobrowser";
proc << "--caption" << i18n("Konversation Bookmarks Editor"); proc << "--caption" << i18n("Konversation Bookmarks Editor");
proc << m_file; proc << m_file;
proc.start(KProcess::DontCare); proc.start(TDEProcess::DontCare);
} }
void KonviBookmarkHandler::slotBookmarksChanged( const TQString &, void KonviBookmarkHandler::slotBookmarksChanged( const TQString &,

2
konversation/src/linkaddressbook/addressbook_base.cpp
Unescape View File

@ -384,7 +384,7 @@ namespace Konversation
// then call it on the command line to actually put it in edit mode. This is stupid :( // then call it on the command line to actually put it in edit mode. This is stupid :(
kapp->startServiceByDesktopName( "kaddressbook" ); kapp->startServiceByDesktopName( "kaddressbook" );
KProcess *proc = new KProcess; TDEProcess *proc = new TDEProcess;
*proc << "kaddressbook"; *proc << "kaddressbook";
*proc << "--editor-only" << "--uid" << uid; *proc << "--editor-only" << "--uid" << uid;
kdDebug() << "running kaddressbook --editor-only --uid " << uid << endl; kdDebug() << "running kaddressbook --editor-only --uid " << uid << endl;

2
konversation/src/nicksonline.cpp
Unescape View File

@ -59,7 +59,7 @@ NicksOnline::NicksOnline(TQWidget* parent): ChatWindow(parent)
m_whoisRequested = true; m_whoisRequested = true;
m_nickListView->addColumn(i18n("Network/Nickname/Channel")); 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->addColumn(i18n("Additional Information"));
m_nickListView->setFullWidth(true); m_nickListView->setFullWidth(true);
m_nickListView->setRootIsDecorated(true); m_nickListView->setRootIsDecorated(true);

4
konversation/src/osd.cpp
Unescape View File

@ -193,8 +193,8 @@ void OSDWidget::setBackgroundColor( const TQColor &newColor )
void OSDWidget::unsetColors() void OSDWidget::unsetColors()
{ {
setPaletteForegroundColor( KGlobalSettings::activeTextColor() ); setPaletteForegroundColor( TDEGlobalSettings::activeTextColor() );
setPaletteBackgroundColor( KGlobalSettings::activeTitleColor() ); setPaletteBackgroundColor( TDEGlobalSettings::activeTitleColor() );
refresh(); refresh();
} }

6
konversation/src/query.cpp
Unescape View File

@ -102,7 +102,7 @@ Query::Query(TQWidget* parent, TQString _name) : ChatWindow(parent)
awayLabel->hide(); awayLabel->hide();
blowfishLabel = new TQLabel(inputBox); blowfishLabel = new TQLabel(inputBox);
blowfishLabel->hide(); blowfishLabel->hide();
blowfishLabel->setPixmap(KGlobal::iconLoader()->loadIcon("encrypted", KIcon::Toolbar)); blowfishLabel->setPixmap(TDEGlobal::iconLoader()->loadIcon("encrypted", KIcon::Toolbar));
queryInput=new IRCInput(inputBox); queryInput=new IRCInput(inputBox);
getTextView()->installEventFilter(queryInput); getTextView()->installEventFilter(queryInput);
@ -312,8 +312,8 @@ void Query::updateAppearance()
} }
else else
{ {
getTextView()->setFont(KGlobalSettings::generalFont()); getTextView()->setFont(TDEGlobalSettings::generalFont());
queryInput->setFont(KGlobalSettings::generalFont()); queryInput->setFont(TDEGlobalSettings::generalFont());
} }
ChatWindow::updateAppearance(); ChatWindow::updateAppearance();

2
konversation/src/rawlog.cpp
Unescape View File

@ -57,7 +57,7 @@ void RawLog::updateAppearance()
if (Preferences::customTextFont()) if (Preferences::customTextFont())
getTextView()->setFont(Preferences::textFont()); getTextView()->setFont(Preferences::textFont());
else else
getTextView()->setFont(KGlobalSettings::generalFont()); getTextView()->setFont(TDEGlobalSettings::generalFont());
ChatWindow::updateAppearance(); ChatWindow::updateAppearance();
} }

2
konversation/src/scriptlauncher.cpp
Unescape View File

@ -39,7 +39,7 @@ void ScriptLauncher::launchScript(const TQString& target, const TQString &parame
{ {
KStandardDirs kstddir; KStandardDirs kstddir;
// TQString scriptPath(kstddir.saveLocation("data",TQString("konversation/scripts"))); // TQString scriptPath(kstddir.saveLocation("data",TQString("konversation/scripts")));
KProcess process; TDEProcess process;
// send the script all the information it will need // send the script all the information it will need
TQStringList parameterList=TQStringList::split(' ',parameter); TQStringList parameterList=TQStringList::split(' ',parameter);

4
konversation/src/server.cpp
Unescape View File

@ -203,7 +203,7 @@ void Server::doPreShellCommand()
TQString command = getIdentity()->getShellCommand(); TQString command = getIdentity()->getShellCommand();
getStatusView()->appendServerMessage(i18n("Info"),"Running preconfigured command..."); 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); TQStringList commandList = TQStringList::split(" ",command);
@ -359,7 +359,7 @@ void Server::setAutoJoin(bool on)
m_autoJoin = on; m_autoJoin = on;
} }
void Server::preShellCommandExited(KProcess* proc) void Server::preShellCommandExited(TDEProcess* proc)
{ {
if (proc && proc->normalExit()) if (proc && proc->normalExit())

4
konversation/src/server.h
Unescape View File

@ -474,7 +474,7 @@ void resetNickSelection();
protected slots: protected slots:
void lookupFinished(); void lookupFinished();
void preShellCommandExited(KProcess*); void preShellCommandExited(TDEProcess*);
void ircServerConnectionSuccess(); void ircServerConnectionSuccess();
void startAwayTimer(); void startAwayTimer();
void incoming(); void incoming();
@ -669,7 +669,7 @@ void resetNickSelection();
ScriptLauncher* m_scriptLauncher; ScriptLauncher* m_scriptLauncher;
KProcess m_preShellCommand; TDEProcess m_preShellCommand;
private: private:
/// Helper object to construct ISON (notify) list and map offline nicks to /// Helper object to construct ISON (notify) list and map offline nicks to

6
konversation/src/statuspanel.cpp
Unescape View File

@ -193,9 +193,9 @@ void StatusPanel::updateAppearance()
} }
else else
{ {
getTextView()->setFont(KGlobalSettings::generalFont()); getTextView()->setFont(TDEGlobalSettings::generalFont());
statusInput->setFont(KGlobalSettings::generalFont()); statusInput->setFont(TDEGlobalSettings::generalFont());
nicknameCombobox->setFont(KGlobalSettings::generalFont()); nicknameCombobox->setFont(TDEGlobalSettings::generalFont());
} }
showNicknameBox(Preferences::showNicknameBox()); showNicknameBox(Preferences::showNicknameBox());

2
konversation/src/theme_preferences.cpp
Unescape View File

@ -73,7 +73,7 @@ void Theme_Config::loadSettings()
int currentThemeIndex = 0; int currentThemeIndex = 0;
// get list of theme dirs // 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 we have any themes
if(m_dirs.count() > 0) if(m_dirs.count() > 0)

4
konversation/src/topiclabel.cpp
Unescape View File

@ -152,14 +152,14 @@ namespace Konversation
{ {
TQString cmd = Preferences::webBrowserCmd(); TQString cmd = Preferences::webBrowserCmd();
cmd.replace("%u",KURL::fromPathOrURL(link).url()); cmd.replace("%u",KURL::fromPathOrURL(link).url());
KProcess *proc = new KProcess; TDEProcess *proc = new TDEProcess;
TQStringList cmdAndArgs = KShell::splitArgs(cmd); TQStringList cmdAndArgs = KShell::splitArgs(cmd);
*proc << cmdAndArgs; *proc << cmdAndArgs;
// This code will also work, but starts an extra shell process. // This code will also work, but starts an extra shell process.
// kdDebug() << "IRCView::linkClickSlot(): cmd = " << cmd << endl; // kdDebug() << "IRCView::linkClickSlot(): cmd = " << cmd << endl;
// *proc << cmd; // *proc << cmd;
// proc->setUseShell(true); // proc->setUseShell(true);
proc->start(KProcess::DontCare); proc->start(TDEProcess::DontCare);
delete proc; delete proc;
} }
} }

4
konversation/src/urlcatcher.cpp
Unescape View File

@ -144,14 +144,14 @@ void UrlCatcher::openUrl(TQListViewItem* item)
{ {
TQString cmd = Preferences::webBrowserCmd(); TQString cmd = Preferences::webBrowserCmd();
cmd.replace("%u", url); cmd.replace("%u", url);
KProcess *proc = new KProcess; TDEProcess *proc = new TDEProcess;
TQStringList cmdAndArgs = KShell::splitArgs(cmd); TQStringList cmdAndArgs = KShell::splitArgs(cmd);
*proc << cmdAndArgs; *proc << cmdAndArgs;
// This code will also work, but starts an extra shell process. // This code will also work, but starts an extra shell process.
// kdDebug() << "UrlCatcher::openUrl(): cmd = " << cmd << endl; // kdDebug() << "UrlCatcher::openUrl(): cmd = " << cmd << endl;
// *proc << cmd; // *proc << cmd;
// proc->setUseShell(true); // proc->setUseShell(true);
proc->start(KProcess::DontCare); proc->start(TDEProcess::DontCare);
delete proc; delete proc;
} }
} }

10
konversation/src/viewcontainer.cpp
Unescape View File

@ -64,7 +64,7 @@ ViewContainer::ViewContainer(KonversationMainWindow* window):
m_queryViewCount = 0; m_queryViewCount = 0;
m_viewTreeSplitter = new TQSplitter(m_window, "view_tree_splitter"); m_viewTreeSplitter = new TQSplitter(m_window, "view_tree_splitter");
m_viewTreeSplitter->setOpaqueResize(KGlobalSettings::opaqueResize()); m_viewTreeSplitter->setOpaqueResize(TDEGlobalSettings::opaqueResize());
m_saveSplitterSizesLock = true; m_saveSplitterSizesLock = true;
// The tree needs to be initialized before the tab widget so that it // 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(); m_vbox->hide(); //m_tabWidget->hide();
KPushButton* closeBtn = new KPushButton(m_tabWidget); 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->resize(22, 22);
closeBtn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); closeBtn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
m_tabWidget->setCornerWidget(closeBtn); m_tabWidget->setCornerWidget(closeBtn);
@ -363,7 +363,7 @@ void ViewContainer::updateAppearance()
if (Preferences::customTextFont()) if (Preferences::customTextFont())
font = Preferences::textFont(); font = Preferences::textFont();
else else
font = KGlobalSettings::generalFont(); font = TDEGlobalSettings::generalFont();
m_insertCharDialog->setFont(font); m_insertCharDialog->setFont(font);
} }
@ -378,7 +378,7 @@ void ViewContainer::updateTabWidgetAppearance()
if (Preferences::customTabFont()) if (Preferences::customTabFont())
m_tabWidget->setFont(Preferences::tabFont()); m_tabWidget->setFont(Preferences::tabFont());
else else
m_tabWidget->setFont(KGlobalSettings::generalFont()); m_tabWidget->setFont(TDEGlobalSettings::generalFont());
m_tabWidget->setTabPosition((Preferences::tabPlacement()==PreferencesBase::Top) ? m_tabWidget->setTabPosition((Preferences::tabPlacement()==PreferencesBase::Top) ?
TQTabWidget::Top : TQTabWidget::Bottom); TQTabWidget::Top : TQTabWidget::Bottom);
@ -1855,7 +1855,7 @@ void ViewContainer::insertCharacter()
if (Preferences::customTextFont()) if (Preferences::customTextFont())
font = Preferences::textFont(); font = Preferences::textFont();
else else
font = KGlobalSettings::generalFont(); font = TDEGlobalSettings::generalFont();
if (!m_insertCharDialog) if (!m_insertCharDialog)
{ {

8
konversation/src/viewtree.cpp
Unescape View File

@ -112,7 +112,7 @@ void ViewTree::updateAppearance()
if (Preferences::customTabFont()) if (Preferences::customTabFont())
setFont(Preferences::tabFont()); setFont(Preferences::tabFont());
else else
setFont(KGlobalSettings::generalFont()); setFont(TDEGlobalSettings::generalFont());
TQColor fg, bg; TQColor fg, bg;
@ -123,8 +123,8 @@ void ViewTree::updateAppearance()
} }
else else
{ {
bg = KGlobalSettings::baseColor(); bg = TDEGlobalSettings::baseColor();
fg = KGlobalSettings::textColor(); fg = TDEGlobalSettings::textColor();
} }
setPalette(TDEApplication::palette()); setPalette(TDEApplication::palette());
@ -957,7 +957,7 @@ void ViewTree::paintEmptyArea(TQPainter* p, const TQRect& rect)
return; return;
TQColor bgColor = paletteBackgroundColor(); TQColor bgColor = paletteBackgroundColor();
TQColor selColor = KGlobalSettings::highlightColor(); TQColor selColor = TDEGlobalSettings::highlightColor();
TQColor midColor = last->mixColor(bgColor, selColor); TQColor midColor = last->mixColor(bgColor, selColor);
p->setPen(selColor); p->setPen(selColor);

20
konversation/src/viewtreeitem.cpp
Unescape View File

@ -37,7 +37,7 @@ ViewTreeItem::ViewTreeItem(TQListView* parent, const TQString& name, ChatWindow*
setView(view); setView(view);
setViewType(view->getType()); setViewType(view->getType());
m_color = KGlobalSettings::textColor(); m_color = TDEGlobalSettings::textColor();
m_customColorSet = false; m_customColorSet = false;
setOpen(true); setOpen(true);
@ -66,7 +66,7 @@ ViewTreeItem::ViewTreeItem(TQListViewItem* parent, const TQString& name, ChatWin
setView(view); setView(view);
setViewType(view->getType()); setViewType(view->getType());
m_color = KGlobalSettings::textColor(); m_color = TDEGlobalSettings::textColor();
m_customColorSet = false; m_customColorSet = false;
setOpen(true); setOpen(true);
@ -91,7 +91,7 @@ ViewTreeItem::ViewTreeItem(TQListViewItem* parent, TQListViewItem* afterItem, co
setView(view); setView(view);
setViewType(view->getType()); setViewType(view->getType());
m_color = KGlobalSettings::textColor(); m_color = TDEGlobalSettings::textColor();
m_customColorSet = false; m_customColorSet = false;
setOpen(true); setOpen(true);
@ -184,7 +184,7 @@ TQColor ViewTreeItem::getColor() const
if (Preferences::inputFieldsBackgroundColor()) if (Preferences::inputFieldsBackgroundColor())
return Preferences::color(Preferences::ChannelMessage); return Preferences::color(Preferences::ChannelMessage);
else else
return KGlobalSettings::textColor(); return TDEGlobalSettings::textColor();
} }
else else
return m_color; return m_color;
@ -341,16 +341,16 @@ void ViewTreeItem::paintCell(TQPainter* p, const TQColorGroup& /* cg */, int /*
TQPixmap buffer(width, height()); TQPixmap buffer(width, height());
TQPainter painter(&buffer); TQPainter painter(&buffer);
TQColor textColor = isSelected() ? KGlobalSettings::highlightedTextColor() : getColor(); TQColor textColor = isSelected() ? TDEGlobalSettings::highlightedTextColor() : getColor();
TQColor background = isSelected() ? KGlobalSettings::highlightColor() : listView()->paletteBackgroundColor(); TQColor background = isSelected() ? TDEGlobalSettings::highlightColor() : listView()->paletteBackgroundColor();
if (m_isHighlighted) background = Preferences::inputFieldsBackgroundColor() if (m_isHighlighted) background = Preferences::inputFieldsBackgroundColor()
? Preferences::color(Preferences::AlternateBackground) : KGlobalSettings::alternateBackgroundColor(); ? Preferences::color(Preferences::AlternateBackground) : TDEGlobalSettings::alternateBackgroundColor();
// Fill in background. // Fill in background.
painter.fillRect(0, 0, width, height(), background); painter.fillRect(0, 0, width, height(), background);
TQColor bgColor = listView()->paletteBackgroundColor(); TQColor bgColor = listView()->paletteBackgroundColor();
TQColor selColor = m_isHighlighted ? background : KGlobalSettings::highlightColor(); TQColor selColor = m_isHighlighted ? background : TDEGlobalSettings::highlightColor();
TQColor midColor = mixColor(bgColor, selColor); TQColor midColor = mixColor(bgColor, selColor);
int iconWidth = pixmap(0) ? LED_ICON_SIZE : 0; int iconWidth = pixmap(0) ? LED_ICON_SIZE : 0;
@ -411,7 +411,7 @@ void ViewTreeItem::paintCell(TQPainter* p, const TQColorGroup& /* cg */, int /*
if (m_isHighlighted) if (m_isHighlighted)
{ {
selColor = KGlobalSettings::highlightColor(); selColor = TDEGlobalSettings::highlightColor();
midColor = mixColor(bgColor, selColor); midColor = mixColor(bgColor, selColor);
} }
@ -479,7 +479,7 @@ void ViewTreeItem::paintCell(TQPainter* p, const TQColorGroup& /* cg */, int /*
else else
{ {
TQColor lineColor = Preferences::inputFieldsBackgroundColor() TQColor lineColor = Preferences::inputFieldsBackgroundColor()
? Preferences::color(Preferences::AlternateBackground) : KGlobalSettings::alternateBackgroundColor(); ? Preferences::color(Preferences::AlternateBackground) : TDEGlobalSettings::alternateBackgroundColor();
painter.setPen(lineColor); painter.setPen(lineColor);
painter.drawLine(0, 5, width, 5); painter.drawLine(0, 5, width, 5);
} }

Write Preview
Loading…
Cancel
Save