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

Rename a number of libraries and executables to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 5478861326
commit 2571f48ba1
22 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File

8
acinclude.m4
Unescape View File

@ -597,7 +597,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi fi
if test -n "$trinity2ornewer"; then if test -n "$trinity2ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi fi
if test -n "$trinity3ornewer"; then if test -n "$trinity3ornewer"; then
@ -1787,7 +1787,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then if test -z "$1"; then
@ -2092,7 +2092,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KSPELL, "-ltdespell")
@ -2102,7 +2102,7 @@ else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi fi
]) ])

2
file-integration/basketthumbcreator.h
Unescape View File

@ -20,7 +20,7 @@
#include <tqstring.h> #include <tqstring.h>
#include <tqimage.h> #include <tqimage.h>
#include <kio/thumbcreator.h> #include <tdeio/thumbcreator.h>
class BasketThumbCreator : public ThumbCreator class BasketThumbCreator : public ThumbCreator
{ {

4
src/backup.cpp
Unescape View File

@ -38,9 +38,9 @@
#include <tqgroupbox.h> #include <tqgroupbox.h>
#include <kdirselectdialog.h> #include <kdirselectdialog.h>
#include <krun.h> #include <krun.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <ktar.h> #include <ktar.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kprogress.h> #include <kprogress.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <cstdlib> #include <cstdlib>

4
src/basket.cpp
Unescape View File

@ -40,7 +40,7 @@
#include <tqdir.h> #include <tqdir.h>
#include <tqfile.h> #include <tqfile.h>
#include <tqfileinfo.h> #include <tqfileinfo.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <klineedit.h> #include <klineedit.h>
#include <ksavefile.h> #include <ksavefile.h>
@ -5503,7 +5503,7 @@ void Basket::lock()
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
#include <kmimetype.h> #include <kmimetype.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <tqdir.h> #include <tqdir.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <tqregexp.h> #include <tqregexp.h>

4
src/basket.h
Unescape View File

@ -31,7 +31,7 @@
#include <kshortcut.h> #include <kshortcut.h>
#include <kdirwatch.h> #include <kdirwatch.h>
#include <kaction.h> #include <kaction.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include "filter.h" #include "filter.h"
@ -693,7 +693,7 @@ public slots:
#include <tqclipboard.h> #include <tqclipboard.h>
#include <tqptrlist.h> #include <tqptrlist.h>
#include <tqtimer.h> #include <tqtimer.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <tqcolor.h> #include <tqcolor.h>
#include "filter.h" #include "filter.h"

2
src/basket_part.cpp
Unescape View File

@ -23,7 +23,7 @@
#include <kinstance.h> #include <kinstance.h>
#include <kaction.h> #include <kaction.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>
#include <bnpview.h> #include <bnpview.h>

2
src/bnpview.cpp
Unescape View File

@ -35,7 +35,7 @@
#include <klocale.h> #include <klocale.h>
#include <kstringhandler.h> #include <kstringhandler.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kprogress.h> #include <kprogress.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kaboutdata.h> #include <kaboutdata.h>

4
src/exporterdialog.cpp
Unescape View File

@ -20,7 +20,7 @@
#include <kurlrequester.h> #include <kurlrequester.h>
#include <klineedit.h> #include <klineedit.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <tqdir.h> #include <tqdir.h>
#include <tqhbox.h> #include <tqhbox.h>
@ -28,7 +28,7 @@
#include <tqlayout.h> #include <tqlayout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "exporterdialog.h" #include "exporterdialog.h"
#include "basket.h" #include "basket.h"

2
src/global.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <kmainwindow.h> #include <kmainwindow.h>
#include <tqdir.h> #include <tqdir.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "global.h" #include "global.h"
#include "bnpview.h" #include "bnpview.h"

4
src/htmlexporter.cpp
Unescape View File

@ -29,9 +29,9 @@
#include <kapplication.h> #include <kapplication.h>
#include <kglobal.h> #include <kglobal.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <tqdir.h> #include <tqdir.h>
#include <tqfile.h> #include <tqfile.h>

2
src/kiconcanvas.cpp
Unescape View File

@ -1,7 +1,7 @@
/* vi: ts=8 sts=4 sw=4 /* vi: ts=8 sts=4 sw=4
* kate: space-indent on; indent-width 4; mixedindent off; indent-mode cstyle; * kate: space-indent on; indent-width 4; mixedindent off; indent-mode cstyle;
* *
* This file is part of the KDE project, module kfile. * This file is part of the KDE project, module tdefile.
* Copyright (C) 2006 Luke Sandell <lasandell@gmail.com> * Copyright (C) 2006 Luke Sandell <lasandell@gmail.com>
* (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> * (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org>
* (C) 2000 Geert Jansen <jansen@kde.org> * (C) 2000 Geert Jansen <jansen@kde.org>

2
src/kiconcanvas.h
Unescape View File

@ -1,7 +1,7 @@
/* vi: ts=8 sts=4 sw=4 /* vi: ts=8 sts=4 sw=4
* kate: space-indent on; indent-width 4; mixedindent off; indent-mode cstyle; * kate: space-indent on; indent-width 4; mixedindent off; indent-mode cstyle;
* *
* This file is part of the KDE project, module kfile. * This file is part of the KDE project, module tdefile.
* Copyright (C) 2006 Luke Sandell <lasandell@gmail.com> * Copyright (C) 2006 Luke Sandell <lasandell@gmail.com>
* (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> * (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org>
* (C) 2000 Geert Jansen <jansen@kde.org> * (C) 2000 Geert Jansen <jansen@kde.org>

4
src/kicondialog.cpp
Unescape View File

@ -1,7 +1,7 @@
/* vi: ts=8 sts=4 sw=4 /* vi: ts=8 sts=4 sw=4
* kate: space-indent on; indent-width 4; mixedindent off; indent-mode cstyle; * kate: space-indent on; indent-width 4; mixedindent off; indent-mode cstyle;
* *
* This file is part of the KDE project, module kfile. * This file is part of the KDE project, module tdefile.
* Copyright (C) 2006 Luke Sandell <lasandell@gmail.com> * Copyright (C) 2006 Luke Sandell <lasandell@gmail.com>
* (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> * (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org>
* (C) 2000 Geert Jansen <jansen@kde.org> * (C) 2000 Geert Jansen <jansen@kde.org>
@ -29,7 +29,7 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <kprogress.h> #include <kprogress.h>
#include <kiconview.h> #include <kiconview.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kimagefilepreview.h> #include <kimagefilepreview.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kmessagebox.h> #include <kmessagebox.h>

2
src/kicondialog.h
Unescape View File

@ -1,7 +1,7 @@
/* vi: ts=8 sts=4 sw=4 /* vi: ts=8 sts=4 sw=4
* kate: space-indent on; indent-width 4; mixedindent off; indent-mode cstyle; * kate: space-indent on; indent-width 4; mixedindent off; indent-mode cstyle;
* *
* This file is part of the KDE project, module kfile. * This file is part of the KDE project, module tdefile.
* Copyright (C) 2006 Luke Sandell <lasandell@gmail.com> * Copyright (C) 2006 Luke Sandell <lasandell@gmail.com>
* (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org> * (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org>
* (C) 2000 Geert Jansen <jansen@kde.org> * (C) 2000 Geert Jansen <jansen@kde.org>

6
src/likeback.cpp
Unescape View File

@ -20,7 +20,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kaction.h> #include <kaction.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kaboutdata.h> #include <kaboutdata.h>
@ -584,10 +584,10 @@ bool LikeBack::isDevelopmentVersion(const TQString &version)
if (m_process) if (m_process)
return; return;
m_process = new TDEProcess(); m_process = new TDEProcess();
*m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount"); *m_process << TQString::fromLatin1("tdecmshell") << TQString::fromLatin1("kcm_useraccount");
connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(fetchUserEmail()) ); connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(fetchUserEmail()) );
if (!m_process->start()) { if (!m_process->start()) {
kdDebug() << "Couldn't start kcmshell.." << endl; kdDebug() << "Couldn't start tdecmshell.." << endl;
delete m_process; delete m_process;
m_process = 0; m_process = 0;
return; return;

2
src/main.cpp
Unescape View File

@ -32,7 +32,7 @@
#include <tqfile.h> #include <tqfile.h>
#include <tqfileinfo.h> #include <tqfileinfo.h>
#include <kconfig.h> // TMP IN ALPHA 1 #include <tdeconfig.h> // TMP IN ALPHA 1
#include "application.h" #include "application.h"
#include "backgroundmanager.h" #include "backgroundmanager.h"

2
src/mainwindow.cpp
Unescape View File

@ -59,7 +59,7 @@
#include <kglobalaccel.h> #include <kglobalaccel.h>
#include <kkeydialog.h> #include <kkeydialog.h>
#include <kpassivepopup.h> #include <kpassivepopup.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kcolordialog.h> #include <kcolordialog.h>
#include <kaboutdata.h> #include <kaboutdata.h>

10
src/notecontent.cpp
Unescape View File

@ -38,15 +38,15 @@
#include <tqbitmap.h> #include <tqbitmap.h>
#include <kurifilter.h> #include <kurifilter.h>
//#include <kstringhandler.h> //#include <kstringhandler.h>
#include <kfilemetainfo.h> #include <tdefilemetainfo.h>
#include <tqdatetime.h> #include <tqdatetime.h>
#include <tdemultipledrag.h> #include <tdemultipledrag.h>
#include <tqfileinfo.h> #include <tqfileinfo.h>
//#include <kio/kfileitem.h> //#include <tdeio/tdefileitem.h>
#include <kfileitem.h> #include <tdefileitem.h>
#include <kio/previewjob.h> #include <tdeio/previewjob.h>
#include <kio/global.h> #include <tdeio/global.h>
#include <iostream> #include <iostream>

2
src/noteedit.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <kicondialog.h> #include <kicondialog.h>
#include <kcolordialog.h> #include <kcolordialog.h>
#include <kservice.h> #include <kservice.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <klocale.h> #include <klocale.h>
#include <kmainwindow.h> #include <kmainwindow.h>

6
src/notefactory.cpp
Unescape View File

@ -34,11 +34,11 @@
#include <kapplication.h> #include <kapplication.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <tqfile.h> #include <tqfile.h>
#include <kfilemetainfo.h> #include <tdefilemetainfo.h>
#include <kio/jobclasses.h> #include <tdeio/jobclasses.h>
#include <tqtextcodec.h> #include <tqtextcodec.h>
#include <kopenwith.h> #include <kopenwith.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kicondialog.h> #include <kicondialog.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <tqfileinfo.h> #include <tqfileinfo.h>

2
src/settings.cpp
Unescape View File

@ -30,7 +30,7 @@
#include <knuminput.h> #include <knuminput.h>
#include <kcolorcombo.h> #include <kcolorcombo.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>

2
src/softwareimporters.cpp
Unescape View File

@ -22,7 +22,7 @@
#include <tqdir.h> #include <tqdir.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <klocale.h> #include <klocale.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <tqptrstack.h> #include <tqptrstack.h>
#include <tqlayout.h> #include <tqlayout.h>
#include <tqvbuttongroup.h> #include <tqvbuttongroup.h>

Write Preview
Loading…
Cancel
Save