Rename KApplication to TDEApplication to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent 1aa871ce49
commit 763a0f570f

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

@ -22,7 +22,7 @@
*@author Pascal Brachet
*/
class KileApplication : public KApplication
class KileApplication : public TDEApplication
{
public:
KileApplication();

@ -141,7 +141,7 @@ void KileStatsDlg::slotUser1() // Copy
KILE_DEBUG() << "Copy Button was clicked" << endl;
KILE_DEBUG() << "Open tab is " << activePageIndex() << ' ' + ( m_pagetoname.contains(activePageIndex()) ? m_pagetoname[activePageIndex()] : "No such entry" )<< endl;
TQClipboard *clip = KApplication::clipboard();
TQClipboard *clip = TDEApplication::clipboard();
TQString text;
convertText(&text,false);
clip->setText(text,TQClipboard::Selection); // the text will be available with the middle mouse button
@ -152,7 +152,7 @@ void KileStatsDlg::slotUser2() // CopyAsLaTeX
KILE_DEBUG() << "CopyAsLateX Button was clicked" << endl;
KILE_DEBUG() << "Open tab is " << activePageIndex() << ' ' + ( m_pagetoname.contains(activePageIndex()) ? m_pagetoname[activePageIndex()] : "No such entry" )<< endl;
TQClipboard *clip = KApplication::clipboard();
TQClipboard *clip = TDEApplication::clipboard();
TQString text;
convertText(&text,true);
clip->setText(text,TQClipboard::Selection);

@ -361,7 +361,7 @@ void Manager::onKatePopupMenuRequest(void)
if(!pasteAsLaTeXAction->isPlugged())
pasteAsLaTeXAction->plug(viewPopupMenu);
TQClipboard *clip = KApplication::clipboard();
TQClipboard *clip = TDEApplication::clipboard();
if(NULL != clip)
pasteAsLaTeXAction->setEnabled(!clip->text().isNull());
}
@ -464,7 +464,7 @@ void Manager::pasteAsLaTeX(void)
doc->removeSelectedText();
PlainToLaTeXConverter cvt;
TQString toPaste = cvt.ConvertToLaTeX(KApplication::clipboard()->text());
TQString toPaste = cvt.ConvertToLaTeX(TDEApplication::clipboard()->text());
doc->insertText(cursorLine, cursorCol, toPaste);
// End of the "atomic edit operation"

@ -117,7 +117,7 @@ TexDocDialog::TexDocDialog(TQWidget *parent, const char *name)
m_texmfdocPath = TQString();
m_texdoctkPath = TQString();
TQDesktopWidget *desktop = KApplication::desktop();
TQDesktopWidget *desktop = TDEApplication::desktop();
int w = desktop->screenGeometry(0).width();
if ( w >= 1024 )
w = 550;

Loading…
Cancel
Save