Rename KApplication to TDEApplication to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent dff37d34bf
commit 08a27ff4ca

@ -1978,20 +1978,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");

@ -1854,7 +1854,7 @@ void Basket::clickedToInsert(TQMouseEvent *event, Note *clicked, /*Note::Zone*/i
{
Note *note;
if (event->button() == Qt::MidButton)
note = NoteFactory::dropNote(KApplication::clipboard()->data(TQClipboard::Selection), this);
note = NoteFactory::dropNote(TDEApplication::clipboard()->data(TQClipboard::Selection), this);
else
note = NoteFactory::createNoteText("", this);
@ -2075,7 +2075,7 @@ void Basket::pasteNote(TQClipboard::Mode mode)
}
closeEditor();
unselectAll();
Note *note = NoteFactory::dropNote(KApplication::clipboard()->data(mode), this);
Note *note = NoteFactory::dropNote(TDEApplication::clipboard()->data(mode), this);
if (note) {
insertCreatedNote(note);
//unselectAllBut(note);
@ -2407,7 +2407,7 @@ void Basket::contentsMouseDoubleClickEvent(TQMouseEvent *event)
void Basket::contentsMouseMoveEvent(TQMouseEvent *event)
{
// Drag the notes:
if (m_canDrag && (m_pressPos - event->pos()).manhattanLength() > KApplication::startDragDistance()) {
if (m_canDrag && (m_pressPos - event->pos()).manhattanLength() > TDEApplication::startDragDistance()) {
m_canDrag = false;
m_isSelecting = false; // Don't draw selection rectangle ater drag!
m_selectionStarted = false;
@ -2764,7 +2764,7 @@ void Basket::drawInserter(TQPainter &painter, int xPainter, int yPainter)
int lineY = (m_inserterGroup && m_inserterTop ? 0 : 2);
int roundY = (m_inserterGroup && m_inserterTop ? 0 : 1);
TQColor dark = KApplication::palette().active().dark();
TQColor dark = TDEApplication::palette().active().dark();
TQColor light = dark.light().light();
if (m_inserterGroup && Settings::groupOnInsertionLine())
light = Tools::mixColor(light, KGlobalSettings::highlightColor());
@ -4196,7 +4196,7 @@ void Basket::noteDeleteWithoutConfirmation(bool deleteFilesToo)
void Basket::doCopy(CopyMode copyMode)
{
TQClipboard *cb = KApplication::clipboard();
TQClipboard *cb = TDEApplication::clipboard();
TQClipboard::Mode mode = (copyMode == CopyToSelection ? TQClipboard::Selection : TQClipboard::Clipboard);
NoteSelection *selection = selectedNotes();

@ -54,7 +54,7 @@ class KColorPopup;
* TQWidget::paletteChange(oldPalette);
* }
* @endcode
* or connect the signal KApplication::kdisplayPaletteChanged() to a slot that will set the default color of this widget.
* or connect the signal TDEApplication::kdisplayPaletteChanged() to a slot that will set the default color of this widget.
*
* @par Advanced usage:
* By default, the combobox show a well balanced rainbow, OK for most usages, and you don't need to do anything for it to work.\n

@ -114,7 +114,7 @@ bool Keyboard::altPressed()
* @return the keyboard modifiers
* @since 3.1
/
uint KApplication::keyboardModifiers()
uint TDEApplication::keyboardModifiers()
{
Window root;
Window child;

@ -218,7 +218,7 @@ LikeBack::LikeBack(Button buttons, bool showBarByDefault, KConfig *config, const
d->aboutData = aboutData;
d->showBarByDefault = showBarByDefault;
// Use default KApplication config and aboutData if not provided:
// Use default TDEApplication config and aboutData if not provided:
if (d->config == 0)
d->config = kapp->config();
if (d->aboutData == 0)

@ -118,8 +118,8 @@ class LikeBack : public TQObject
* The button-bar display is stored by version. On a new version, your default value will take effect again.
* This allow you to disable the button-bar once the version is stable enought to be released as final.
* @param config Set the configuration file where to store the user email address and if the button-bar should be shown.
* By default (null), the KApplication configuration object is used.
* @param aboutData Set the KAboutData instance used to get the application name and version. By default (null), the KApplication about data object is used.
* By default (null), the TDEApplication configuration object is used.
* @param aboutData Set the KAboutData instance used to get the application name and version. By default (null), the TDEApplication about data object is used.
* The application name is only used in the first-use information message.
* The version is used to store the button-bar visibility per version (can be shown in a development version but not in a final one...)
* and to send with the comment, so you can filter per version and know if a comment refers the latest version of the application or not.

@ -231,7 +231,7 @@ void LinkLabel::setLook(LinkLook *look) // FIXME: called externaly (so, without
font.setUnderline(look->underlineOutside());
font.setItalic(look->italic());
m_title->setFont(font);
m_title->setPaletteForegroundColor( m_isSelected ? KApplication::palette().active().highlightedText() : look->effectiveColor() );
m_title->setPaletteForegroundColor( m_isSelected ? TDEApplication::palette().active().highlightedText() : look->effectiveColor() );
m_icon->setShown( m_icon->pixmap() && ! m_icon->pixmap()->isNull() );
@ -323,7 +323,7 @@ void LinkLabel::setSelected(bool selected)
{
m_isSelected = selected;
if (selected)
m_title->setPaletteForegroundColor(KApplication::palette().active().highlightedText());
m_title->setPaletteForegroundColor(TDEApplication::palette().active().highlightedText());
else if (m_isHovered)
m_title->setPaletteForegroundColor(m_look->effectiveHoverColor());
else

@ -111,5 +111,5 @@ int main(int argc, char *argv[])
/* Go */
int result = app.exec();
//return result;
exit(result); // Do not clean up memory to not crash while deleting the KApplication, or do not hang up on KDE exit
exit(result); // Do not clean up memory to not crash while deleting the TDEApplication, or do not hang up on KDE exit
}

@ -161,10 +161,10 @@ void KSystemTray2::displayCloseMessage(TQString fileMenu)
const int IMAGE_BORDER = 1;
int ax = g.x() - x - CIRCLE_MARGINS - 1;
int ay = g.y() - y - CIRCLE_MARGINS - 1;
painter.setPen( TQPen(KApplication::palette().active().dark(), CIRCLE_WIDTH) );
painter.setPen( TQPen(TDEApplication::palette().active().dark(), CIRCLE_WIDTH) );
painter.drawArc(ax + SHADOW_OFFSET, ay + SHADOW_OFFSET,
tw + 2*CIRCLE_MARGINS, th + 2*CIRCLE_MARGINS, 0, 16*360);
painter.setPen( TQPen(TQt::red/*KApplication::palette().active().highlight()*/, CIRCLE_WIDTH) );
painter.setPen( TQPen(TQt::red/*TDEApplication::palette().active().highlight()*/, CIRCLE_WIDTH) );
painter.drawArc(ax, ay, tw + 2*CIRCLE_MARGINS, th + 2*CIRCLE_MARGINS, 0, 16*360);
#if 1
// Draw the pixmap over the screenshot in case a window hide the icon:
@ -174,7 +174,7 @@ void KSystemTray2::displayCloseMessage(TQString fileMenu)
// Then, we add a border arround the image to make it more visible:
TQPixmap finalShot(w + 2*IMAGE_BORDER, h + 2*IMAGE_BORDER);
finalShot.fill(KApplication::palette().active().foreground());
finalShot.fill(TDEApplication::palette().active().foreground());
painter.begin(&finalShot);
painter.drawPixmap(IMAGE_BORDER, IMAGE_BORDER, shot);
painter.end();

Loading…
Cancel
Save