From 74f47aebb77b4744bf18960b81c3744106cf56e0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:19:40 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- kcoloredit/kcolorchooser.cpp | 2 +- kcoloredit/kcoloredit.h | 4 ++-- kcoloredit/kcoloreditdoc.cpp | 4 ++-- kcoloredit/kcoloreditdoc.h | 2 +- kcoloredit/main.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'kcoloredit') diff --git a/kcoloredit/kcolorchooser.cpp b/kcoloredit/kcolorchooser.cpp index 72ec0930..cf4289d7 100644 --- a/kcoloredit/kcolorchooser.cpp +++ b/kcoloredit/kcolorchooser.cpp @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; KColorDialog dlg; diff --git a/kcoloredit/kcoloredit.h b/kcoloredit/kcoloredit.h index e0ce9140..4c028147 100644 --- a/kcoloredit/kcoloredit.h +++ b/kcoloredit/kcoloredit.h @@ -44,7 +44,7 @@ class KColorEditView; * KColorEditApp reimplements the methods that KMainWindow provides for main window handling and supports * full session management as well as keyboard accelerator configuration by using KAccel. * @see KMainWindow - * @see KApplication + * @see TDEApplication * @see KConfig * @see KAccel * @@ -85,7 +85,7 @@ class KColorEditApp : public KMainWindow void initActions(); /** initMenuBar creates the menubar and inserts the menupopups as well as creating the helpMenu. - * @see KApplication#getHelpMenu + * @see TDEApplication#getHelpMenu */ void initStatusBar(); /** initializes the document object of the main window that is connected to the view in initView(). diff --git a/kcoloredit/kcoloreditdoc.cpp b/kcoloredit/kcoloreditdoc.cpp index 954d64a3..b5823b1b 100644 --- a/kcoloredit/kcoloreditdoc.cpp +++ b/kcoloredit/kcoloreditdoc.cpp @@ -235,7 +235,7 @@ void KColorEditDoc::copyToClipboard(Palette& palette) { TQString text; TQTextOStream stream(&text); palette.save(stream, 0, false); - KApplication::clipboard()->setText(text); + TDEApplication::clipboard()->setText(text); emit clipboardChanged(); } @@ -260,7 +260,7 @@ void KColorEditDoc::paste() { Palette palettePaste; TQString text; TQTextIStream stream(&text); - text = KApplication::clipboard()->text(); + text = TDEApplication::clipboard()->text(); if(palettePaste.load( stream, false )) { m_paletteHistory.paste(paletteCursorPos(), palettePaste); setPaletteSelection(paletteCursorPos(), paletteCursorPos() + diff --git a/kcoloredit/kcoloreditdoc.h b/kcoloredit/kcoloreditdoc.h index d6ca32ca..edf5242c 100644 --- a/kcoloredit/kcoloreditdoc.h +++ b/kcoloredit/kcoloreditdoc.h @@ -37,7 +37,7 @@ class KColorEditView; /** KColorEditDoc provides a document object for a document-view model. * * The KColorEditDoc class provides a document object that can be used in conjunction with the classes KColorEditApp and KColorEditView - * to create a document-view model for standard TDE applications based on KApplication and KMainWindow. Thereby, the document object + * to create a document-view model for standard TDE applications based on TDEApplication and KMainWindow. Thereby, the document object * is created by the KColorEditApp instance and contains the document structure with the according methods for manipulation of the document * data by KColorEditView objects. Also, KColorEditDoc contains the methods for serialization of the document data from and to files. * diff --git a/kcoloredit/main.cpp b/kcoloredit/main.cpp index d0d4893e..e92bbdca 100644 --- a/kcoloredit/main.cpp +++ b/kcoloredit/main.cpp @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. - KApplication app; + TDEApplication app; if (app.isRestored()) { -- cgit v1.2.3