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

Rename KApplication to TDEApplication to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent ffde8b0e0c
commit 4c93447121
17 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File

26
acinclude.m4
Unescape View File

@ -1994,20 +1994,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h> #include <kapp.h>
int main() { int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n", printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data()); TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n");

2
konversation/src/channel.cpp
Unescape View File

@ -2611,7 +2611,7 @@ void Channel::processPendingNicks()
// Remove possible mode characters from nickname and store the resulting mode // Remove possible mode characters from nickname and store the resulting mode
m_server->mangleNicknameWithModes(nickname, admin, owner, op, halfop, voice); m_server->mangleNicknameWithModes(nickname, admin, owner, op, halfop, voice);
// TODO: make these an enumeration in KApplication or somewhere, we can use them as well // TODO: make these an enumeration in TDEApplication or somewhere, we can use them as well
unsigned int mode = (admin ? 16 : 0) + unsigned int mode = (admin ? 16 : 0) +
(owner ? 8 : 0) + (owner ? 8 : 0) +
(op ? 4 : 0) + (op ? 4 : 0) +

4
konversation/src/channeloptionsdialog.cpp
Unescape View File

@ -448,7 +448,7 @@ namespace Konversation
{ {
TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Escape, 27, Qt::NoButton); TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Escape, 27, Qt::NoButton);
KApplication::sendEvent(m_widget->banList->renameLineEdit(), &e); TDEApplication::sendEvent(m_widget->banList->renameLineEdit(), &e);
} }
topicBeingEdited(false); topicBeingEdited(false);
@ -461,7 +461,7 @@ namespace Konversation
{ {
TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Return, 13, Qt::NoButton); TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Return, 13, Qt::NoButton);
KApplication::sendEvent(m_widget->banList->renameLineEdit(), &e); TDEApplication::sendEvent(m_widget->banList->renameLineEdit(), &e);
} }
} }

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

@ -526,7 +526,7 @@ void Preferences::setAutoUserhost(bool state)
bool Preferences::dialogFlag(const TQString& flagName) bool Preferences::dialogFlag(const TQString& flagName)
{ {
KConfig* config=KApplication::kApplication()->config(); KConfig* config=TDEApplication::kApplication()->config();
config->setGroup("Notification self()->Messages"); config->setGroup("Notification self()->Messages");
@ -538,7 +538,7 @@ bool Preferences::dialogFlag(const TQString& flagName)
void Preferences::setDialogFlag(const TQString& flagName,bool state) void Preferences::setDialogFlag(const TQString& flagName,bool state)
{ {
KConfig* config=KApplication::kApplication()->config(); KConfig* config=TDEApplication::kApplication()->config();
config->setGroup("Notification self()->Messages"); config->setGroup("Notification self()->Messages");

2
konversation/src/highlight_preferences.cpp
Unescape View File

@ -314,7 +314,7 @@ TQStringList Highlight_Config::currentHighlightList()
void Highlight_Config::playSound() void Highlight_Config::playSound()
{ {
KonversationApplication *konvApp=static_cast<KonversationApplication *>(KApplication::kApplication()); KonversationApplication *konvApp=static_cast<KonversationApplication *>(TDEApplication::kApplication());
konvApp->sound()->play(KURL(soundURL->url())); konvApp->sound()->play(KURL(soundURL->url()));
} }

2
konversation/src/inputfilter.cpp
Unescape View File

@ -113,7 +113,7 @@ void InputFilter::parseLine(const TQString& a_newLine)
void InputFilter::parseClientCommand(const TQString &prefix, const TQString &command, const TQStringList &parameterList, const TQString &_trailing) void InputFilter::parseClientCommand(const TQString &prefix, const TQString &command, const TQStringList &parameterList, const TQString &_trailing)
{ {
KonversationApplication* konv_app = static_cast<KonversationApplication *>(KApplication::kApplication()); KonversationApplication* konv_app = static_cast<KonversationApplication *>(TDEApplication::kApplication());
Q_ASSERT(konv_app); Q_ASSERT(konv_app);
Q_ASSERT(server); Q_ASSERT(server);
// Extract nickname from prefix // Extract nickname from prefix

4
konversation/src/ircinput.cpp
Unescape View File

@ -44,7 +44,7 @@ IRCInput::IRCInput(TQWidget* parent) : KTextEdit(parent)
//nor in compensating for it if my guess is incorrect. so, cache it. //nor in compensating for it if my guess is incorrect. so, cache it.
m_qtBoxPadding=m_lastHeight-fontMetrics().lineSpacing(); m_qtBoxPadding=m_lastHeight-fontMetrics().lineSpacing();
connect(KApplication::kApplication(), TQT_SIGNAL(appearanceChanged()), this, TQT_SLOT(updateAppearance())); connect(TDEApplication::kApplication(), TQT_SIGNAL(appearanceChanged()), this, TQT_SLOT(updateAppearance()));
m_multiRow = Preferences::useMultiRowInputBox(); m_multiRow = Preferences::useMultiRowInputBox();
m_useSelection = false; m_useSelection = false;
@ -371,7 +371,7 @@ void IRCInput::paste(bool useSelection)
void IRCInput::paste() void IRCInput::paste()
{ {
TQClipboard *cb = KApplication::kApplication()->clipboard(); TQClipboard *cb = TDEApplication::kApplication()->clipboard();
setFocus(); setFocus();
// Copy text from the clipboard (paste) // Copy text from the clipboard (paste)

4
konversation/src/ircview.cpp
Unescape View File

@ -304,7 +304,7 @@ void IRCView::openLink(const TQString& url, bool newTab)
TQCString foundApp, foundObj; TQCString foundApp, foundObj;
TQByteArray data; TQByteArray data;
TQDataStream str(data, IO_WriteOnly); TQDataStream str(data, IO_WriteOnly);
if( KApplication::dcopClient()->findObject("konqueror*", "konqueror-mainwindow*", if( TDEApplication::dcopClient()->findObject("konqueror*", "konqueror-mainwindow*",
"windowCanBeUsedForTab()", data, foundApp, foundObj, false, 3000)) "windowCanBeUsedForTab()", data, foundApp, foundObj, false, 3000))
{ {
DCOPRef ref(foundApp, foundObj); DCOPRef ref(foundApp, foundObj);
@ -1344,7 +1344,7 @@ bool IRCView::contextMenu(TQContextMenuEvent* ce)
break; break;
case CopyUrl: case CopyUrl:
{ {
TQClipboard *cb = KApplication::kApplication()->clipboard(); TQClipboard *cb = TDEApplication::kApplication()->clipboard();
cb->setText(m_urlToCopy,TQClipboard::Selection); cb->setText(m_urlToCopy,TQClipboard::Selection);
cb->setText(m_urlToCopy,TQClipboard::Clipboard); cb->setText(m_urlToCopy,TQClipboard::Clipboard);
break; break;

2
konversation/src/konversationapplication.cpp
Unescape View File

@ -207,7 +207,7 @@ int KonversationApplication::newInstance()
KonversationApplication* KonversationApplication::instance() KonversationApplication* KonversationApplication::instance()
{ {
return static_cast<KonversationApplication*>(KApplication::kApplication()); return static_cast<KonversationApplication*>(TDEApplication::kApplication());
} }
void KonversationApplication::prepareShutdown() void KonversationApplication::prepareShutdown()

2
konversation/src/main.cpp
Unescape View File

@ -93,7 +93,7 @@ int main(int argc, char* argv[])
TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KApplication::addCmdLineOptions(); TDEApplication::addCmdLineOptions();
if (!KUniqueApplication::start()) return 0; if (!KUniqueApplication::start()) return 0;

2
konversation/src/osd.cpp
Unescape View File

@ -407,7 +407,7 @@ OSDWidget::KDesktopLockStatus OSDWidget::isKDesktopLockRunning()
if (!Preferences::oSDCheckDesktopLock()) if (!Preferences::oSDCheckDesktopLock())
return NotLocked; return NotLocked;
DCOPClient *dcopptr = KApplication::kApplication()->dcopClient(); DCOPClient *dcopptr = TDEApplication::kApplication()->dcopClient();
// Can't tell, very weird // Can't tell, very weird
if (!dcopptr || !dcopptr->isAttached()) if (!dcopptr || !dcopptr->isAttached())

2
konversation/src/osd_preferences.cpp
Unescape View File

@ -86,7 +86,7 @@ void OSD_Config::restorePageToDefaults()
void OSD_Config::saveSettings() void OSD_Config::saveSettings()
{ {
//Update the current OSD. //Update the current OSD.
KonversationApplication *konvApp=static_cast<KonversationApplication *>(KApplication::kApplication()); KonversationApplication *konvApp=static_cast<KonversationApplication *>(TDEApplication::kApplication());
konvApp->osd->setEnabled(kcfg_UseOSD->isChecked()); konvApp->osd->setEnabled(kcfg_UseOSD->isChecked());
if (kcfg_UseOSD->isChecked()) if (kcfg_UseOSD->isChecked())

2
konversation/src/outputfilter.cpp
Unescape View File

@ -326,7 +326,7 @@ namespace Konversation
OutputFilterResult OutputFilter::parseShowTuner(const TQString &parameter) OutputFilterResult OutputFilter::parseShowTuner(const TQString &parameter)
{ {
KonversationApplication *konvApp = static_cast<KonversationApplication*>(KApplication::kApplication()); KonversationApplication *konvApp = static_cast<KonversationApplication*>(TDEApplication::kApplication());
OutputFilterResult result; OutputFilterResult result;
if(parameter.isEmpty() || parameter == "on") if(parameter.isEmpty() || parameter == "on")

2
konversation/src/topiclabel.cpp
Unescape View File

@ -199,7 +199,7 @@ namespace Konversation
break; break;
case CopyUrl: case CopyUrl:
{ {
TQClipboard *cb = KApplication::kApplication()->clipboard(); TQClipboard *cb = TDEApplication::kApplication()->clipboard();
cb->setText(m_urlToCopy,TQClipboard::Selection); cb->setText(m_urlToCopy,TQClipboard::Selection);
cb->setText(m_urlToCopy,TQClipboard::Clipboard); cb->setText(m_urlToCopy,TQClipboard::Clipboard);
break; break;

2
konversation/src/urlcatcher.cpp
Unescape View File

@ -167,7 +167,7 @@ void UrlCatcher::copyUrlClicked()
TQListViewItem* item=urlListView->selectedItem(); TQListViewItem* item=urlListView->selectedItem();
if(item) if(item)
{ {
TQClipboard *cb=KApplication::kApplication()->clipboard(); TQClipboard *cb=TDEApplication::kApplication()->clipboard();
cb->setText(item->text(1),TQClipboard::Selection); cb->setText(item->text(1),TQClipboard::Selection);
cb->setText(item->text(1),TQClipboard::Clipboard); cb->setText(item->text(1),TQClipboard::Clipboard);
} }

4
konversation/src/viewcontainer.cpp
Unescape View File

@ -1990,7 +1990,7 @@ void ViewContainer::addUrlCatcher()
{ {
m_urlCatcherPanel=new UrlCatcher(m_tabWidget); m_urlCatcherPanel=new UrlCatcher(m_tabWidget);
addView(m_urlCatcherPanel, i18n("URL Catcher")); addView(m_urlCatcherPanel, i18n("URL Catcher"));
KonversationApplication *konvApp=static_cast<KonversationApplication *>(KApplication::kApplication()); KonversationApplication *konvApp=static_cast<KonversationApplication *>(TDEApplication::kApplication());
connect(konvApp,TQT_SIGNAL(catchUrl(const TQString&,const TQString&)), connect(konvApp,TQT_SIGNAL(catchUrl(const TQString&,const TQString&)),
m_urlCatcherPanel, TQT_SLOT(addUrl(const TQString&,const TQString&)) ); m_urlCatcherPanel, TQT_SLOT(addUrl(const TQString&,const TQString&)) );
connect(m_urlCatcherPanel, TQT_SIGNAL(deleteUrl(const TQString&,const TQString&)), connect(m_urlCatcherPanel, TQT_SIGNAL(deleteUrl(const TQString&,const TQString&)),
@ -2071,7 +2071,7 @@ void ViewContainer::addDccChat(const TQString& myNick,const TQString& nick,const
{ {
if (!listen) // Someone else initiated dcc chat if (!listen) // Someone else initiated dcc chat
{ {
KonversationApplication* konv_app=static_cast<KonversationApplication*>(KApplication::kApplication()); KonversationApplication* konv_app=static_cast<KonversationApplication*>(TDEApplication::kApplication());
konv_app->notificationHandler()->dccChat(m_frontView, nick); konv_app->notificationHandler()->dccChat(m_frontView, nick);
} }

6
konversation/src/viewtree.cpp
Unescape View File

@ -127,7 +127,7 @@ void ViewTree::updateAppearance()
fg = KGlobalSettings::textColor(); fg = KGlobalSettings::textColor();
} }
setPalette(KApplication::palette()); setPalette(TDEApplication::palette());
setPaletteForegroundColor(fg); setPaletteForegroundColor(fg);
setPaletteBackgroundColor(bg); setPaletteBackgroundColor(bg);
} }
@ -674,13 +674,13 @@ void ViewTree::keyPressEvent(TQKeyEvent* e)
ViewTreeItem* item = static_cast<ViewTreeItem*>(selectedItem()); ViewTreeItem* item = static_cast<ViewTreeItem*>(selectedItem());
if (item && item->getView() && item->getView()->isInsertSupported()) if (item && item->getView() && item->getView()->isInsertSupported())
{ {
KApplication::sendEvent(item->getView()->getTextView(), e); TDEApplication::sendEvent(item->getView()->getTextView(), e);
item->getView()->adjustFocus(); item->getView()->adjustFocus();
} }
else if (item && item->getView() && item->getView()->getType() == ChatWindow::Konsole) else if (item && item->getView() && item->getView()->getType() == ChatWindow::Konsole)
{ {
KonsolePanel* panel = static_cast<KonsolePanel*>(item->getView()); KonsolePanel* panel = static_cast<KonsolePanel*>(item->getView());
KApplication::sendEvent(panel->getWidget(), e); TDEApplication::sendEvent(panel->getWidget(), e);
item->getView()->adjustFocus(); item->getView()->adjustFocus();
} }
} }

Write Preview
Loading…
Cancel
Save