summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:19:40 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:19:40 -0600
commit74f47aebb77b4744bf18960b81c3744106cf56e0 (patch)
tree98f808be7ee64f341ba893cfc4fc6a2db7ed5092
parentc705f8f0619865875d6247d9470dced55241bc79 (diff)
downloadtdegraphics-74f47aebb77b4744bf18960b81c3744106cf56e0.tar.gz
tdegraphics-74f47aebb77b4744bf18960b81c3744106cf56e0.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
-rw-r--r--kcoloredit/kcolorchooser.cpp2
-rw-r--r--kcoloredit/kcoloredit.h4
-rw-r--r--kcoloredit/kcoloreditdoc.cpp4
-rw-r--r--kcoloredit/kcoloreditdoc.h2
-rw-r--r--kcoloredit/main.cpp2
-rw-r--r--kdvi/main.cpp2
-rw-r--r--kfax/kfax.cpp2
-rw-r--r--kfax/kfax.h2
-rw-r--r--kfaxview/main.cpp2
-rw-r--r--kghostview/main.cpp2
-rw-r--r--kiconedit/main.cpp2
-rw-r--r--kmrml/kmrml/kcontrol/indextest.cpp2
-rw-r--r--kmrml/kmrml/lib/kmrml_config.cpp2
-rw-r--r--kmrml/kmrml/mrml_part.cpp2
-rw-r--r--kmrml/kmrml/server/watcher.cpp8
-rw-r--r--kolourpaint/kolourpaint.cpp2
-rw-r--r--kolourpaint/kpmainwindow_file.cpp2
-rw-r--r--kolourpaint/kpmainwindow_help.cpp2
-rw-r--r--kolourpaint/kptool.cpp16
-rw-r--r--kooka/main.cpp2
-rw-r--r--kpdf/shell/main.cpp2
-rw-r--r--kpdf/ui/pageview.cpp2
-rw-r--r--kpdf/ui/presentationwidget.cpp2
-rw-r--r--kpovmodeler/main.cpp2
-rw-r--r--kruler/main.cpp2
-rw-r--r--ksnapshot/ksnapshot.cpp2
-rw-r--r--ksnapshot/main.cpp2
-rw-r--r--ksvg/test/external/printnodetest.cpp2
-rw-r--r--ksvg/test/external/svgdisplay.cc2
-rw-r--r--kuickshow/src/main.cpp2
-rw-r--r--kview/kviewcanvas/test/main.cpp2
-rw-r--r--kview/kviewviewer/kviewviewer.cpp2
-rw-r--r--kview/kviewviewer/test/main.cpp2
-rw-r--r--kview/main.cpp2
-rw-r--r--kview/modules/presenter/kviewpresenter.cpp2
-rw-r--r--kviewshell/main.cpp2
36 files changed, 48 insertions, 48 deletions
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())
{
diff --git a/kdvi/main.cpp b/kdvi/main.cpp
index c4bf0d78..2f3defbd 100644
--- a/kdvi/main.cpp
+++ b/kdvi/main.cpp
@@ -50,7 +50,7 @@ int main(int argc, char** argv)
TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions(options);
- KApplication app;
+ TDEApplication app;
// see if we are starting with session management
if (app.isRestored())
diff --git a/kfax/kfax.cpp b/kfax/kfax.cpp
index 17adf629..2cc4e0f5 100644
--- a/kfax/kfax.cpp
+++ b/kfax/kfax.cpp
@@ -160,7 +160,7 @@ bool buttondown;
bool MyApp::x11EventFilter( XEvent * ev)
{
- if (KApplication::x11EventFilter(ev))
+ if (TDEApplication::x11EventFilter(ev))
return TRUE;
if (ev->type == ButtonRelease){
diff --git a/kfax/kfax.h b/kfax/kfax.h
index 0eae301f..f7547a24 100644
--- a/kfax/kfax.h
+++ b/kfax/kfax.h
@@ -46,7 +46,7 @@ class TQScrollBar;
typedef KToolBar::BarPosition BarPosition;
-class MyApp:public KApplication {
+class MyApp:public TDEApplication {
public:
virtual bool x11EventFilter( XEvent * );
};
diff --git a/kfaxview/main.cpp b/kfaxview/main.cpp
index b324d90c..93fd1807 100644
--- a/kfaxview/main.cpp
+++ b/kfaxview/main.cpp
@@ -70,7 +70,7 @@ int main(int argc, char** argv)
TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions(options);
- KApplication app;
+ TDEApplication app;
// see if we are starting with session management
if (app.isRestored())
diff --git a/kghostview/main.cpp b/kghostview/main.cpp
index 05e0f23b..e777e15b 100644
--- a/kghostview/main.cpp
+++ b/kghostview/main.cpp
@@ -47,7 +47,7 @@ int main( int argc, char** argv )
{
TDECmdLineArgs::init( argc, argv, KGVPart::createAboutData() );
TDECmdLineArgs::addCmdLineOptions( options );
- KApplication app;
+ TDEApplication app;
TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
if( kapp->isRestored() )
diff --git a/kiconedit/main.cpp b/kiconedit/main.cpp
index 523a5615..65b8d3e4 100644
--- a/kiconedit/main.cpp
+++ b/kiconedit/main.cpp
@@ -57,7 +57,7 @@ int main(int argc, char **argv)
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
- KApplication a;
+ TDEApplication a;
// setSignalHandler(signalHandler);
diff --git a/kmrml/kmrml/kcontrol/indextest.cpp b/kmrml/kmrml/kcontrol/indextest.cpp
index f6eaa34b..1b86867b 100644
--- a/kmrml/kmrml/kcontrol/indextest.cpp
+++ b/kmrml/kmrml/kcontrol/indextest.cpp
@@ -36,7 +36,7 @@ void IndexTest::slotProgress( int percent, const TQString& message )
int main( int argc, char **argv )
{
- KApplication app( argc, argv, "indextest" );
+ TDEApplication app( argc, argv, "indextest" );
IndexTest *test = new IndexTest();
return app.exec();
diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp
index 1a0f1ac5..94aafa4a 100644
--- a/kmrml/kmrml/lib/kmrml_config.cpp
+++ b/kmrml/kmrml/lib/kmrml_config.cpp
@@ -94,7 +94,7 @@ bool Config::sync()
return notifySlaves;
// This moved to kcontrol/MainPage::save() so we don't have to link against
- // KIO and need a full KApplication instance to work (so that the tiny
+ // KIO and need a full TDEApplication instance to work (so that the tiny
// mrmlsearch binary can also use this class)
// tell the ioslaves about the new configuration
// if ( notifySlaves )
diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp
index a9390097..56074222 100644
--- a/kmrml/kmrml/mrml_part.cpp
+++ b/kmrml/kmrml/mrml_part.cpp
@@ -284,7 +284,7 @@ bool MrmlPart::openURL( const KURL& url )
"kmrml_ask_configure_gift" )
== KMessageBox::Yes )
{
- KApplication::tdeinitExec( "kcmshell",
+ TDEApplication::tdeinitExec( "kcmshell",
TQString::fromLatin1("kcmkmrml"));
setStatus( NeedCollection );
return false;
diff --git a/kmrml/kmrml/server/watcher.cpp b/kmrml/kmrml/server/watcher.cpp
index ce569bab..fe393933 100644
--- a/kmrml/kmrml/server/watcher.cpp
+++ b/kmrml/kmrml/server/watcher.cpp
@@ -34,15 +34,15 @@ Watcher::Watcher( const TQCString& name )
m_daemons.setAutoDelete( true );
// safety, for clients that die without unregistering
- KApplication::dcopClient()->setNotifications( true );
- connect( KApplication::dcopClient(),
+ TDEApplication::dcopClient()->setNotifications( true );
+ connect( TDEApplication::dcopClient(),
TQT_SIGNAL( applicationRemoved( const TQCString& )),
TQT_SLOT( slotAppUnregistered( const TQCString& )));
}
Watcher::~Watcher()
{
- KApplication::dcopClient()->setNotifications( false );
+ TDEApplication::dcopClient()->setNotifications( false );
}
bool Watcher::requireDaemon( const TQCString& clientAppId,
@@ -51,7 +51,7 @@ bool Watcher::requireDaemon( const TQCString& clientAppId,
uint timeout /* seconds */,
int restartOnFailure )
{
- if ( !KApplication::dcopClient()->isApplicationRegistered( clientAppId ) )
+ if ( !TDEApplication::dcopClient()->isApplicationRegistered( clientAppId ) )
kdWarning() << "Watcher::requireDaemon: " << daemonKey
<< ": Client AppID is not registered with DCOP: "
<< clientAppId << endl;
diff --git a/kolourpaint/kolourpaint.cpp b/kolourpaint/kolourpaint.cpp
index 37a2032f..763fe668 100644
--- a/kolourpaint/kolourpaint.cpp
+++ b/kolourpaint/kolourpaint.cpp
@@ -176,7 +176,7 @@ int main (int argc, char *argv [])
TDECmdLineArgs::init (argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions (cmdLineOptions);
- KApplication app;
+ TDEApplication app;
// mainly for changing wallpaper :)
diff --git a/kolourpaint/kpmainwindow_file.cpp b/kolourpaint/kpmainwindow_file.cpp
index 4178bd0a..d7e77f1c 100644
--- a/kolourpaint/kpmainwindow_file.cpp
+++ b/kolourpaint/kpmainwindow_file.cpp
@@ -1352,7 +1352,7 @@ void kpMainWindow::setAsWallpaper (bool centered)
// I'm going to all this trouble because the user might not have tdebase
// installed so tdebase/kdesktop/KBackgroundIface.h might not be around
// to be compiled in (where user == developer :))
- if (!KApplication::dcopClient ()->send ("kdesktop", "KBackgroundIface",
+ if (!TDEApplication::dcopClient ()->send ("kdesktop", "KBackgroundIface",
"setWallpaper(TQString,int)", data))
{
KMessageBox::sorry (this, i18n ("Could not change wallpaper."));
diff --git a/kolourpaint/kpmainwindow_help.cpp b/kolourpaint/kpmainwindow_help.cpp
index c4609ac4..830ed6e8 100644
--- a/kolourpaint/kpmainwindow_help.cpp
+++ b/kolourpaint/kpmainwindow_help.cpp
@@ -110,7 +110,7 @@ void kpMainWindow::slotHelpTakingScreenshots ()
// TODO: Totally bogus logic if twin not running under same user as KolourPaint.
// SYNC: KWin contains PrintScreen key logic
- QCStringList dcopApps = KApplication::dcopClient ()->registeredApplications ();
+ QCStringList dcopApps = TDEApplication::dcopClient ()->registeredApplications ();
#if DEBUG_KP_MAIN_WINDOW
kdDebug () << "\tdcopApps=" << dcopApps << endl;
#endif
diff --git a/kolourpaint/kptool.cpp b/kolourpaint/kptool.cpp
index dd2eea9c..1aa58bf7 100644
--- a/kolourpaint/kptool.cpp
+++ b/kolourpaint/kptool.cpp
@@ -499,12 +499,12 @@ void kpTool::beginInternal ()
m_beganDraw = false;
- uint keyState = KApplication::keyboardModifiers ();
+ uint keyState = TDEApplication::keyboardModifiers ();
- m_shiftPressed = (keyState & KApplication::ShiftModifier);
- m_controlPressed = (keyState & KApplication::ControlModifier);
+ m_shiftPressed = (keyState & TDEApplication::ShiftModifier);
+ m_controlPressed = (keyState & TDEApplication::ControlModifier);
- // TODO: Can't do much about ALT - unless it's always KApplication::Modifier1?
+ // TODO: Can't do much about ALT - unless it's always TDEApplication::Modifier1?
// Ditto for everywhere else where I set SHIFT & CTRL but not alt.
m_altPressed = false;
}
@@ -1372,12 +1372,12 @@ void kpTool::keyUpdateModifierState (TQKeyEvent *e)
#if DEBUG_KP_TOOL && 0
kdDebug () << "\t\tmodifiers not changed - figure out the truth" << endl;
#endif
- uint keyState = KApplication::keyboardModifiers ();
+ uint keyState = TDEApplication::keyboardModifiers ();
- setShiftPressed (keyState & KApplication::ShiftModifier);
- setControlPressed (keyState & KApplication::ControlModifier);
+ setShiftPressed (keyState & TDEApplication::ShiftModifier);
+ setControlPressed (keyState & TDEApplication::ControlModifier);
- // TODO: Can't do much about ALT - unless it's always KApplication::Modifier1?
+ // TODO: Can't do much about ALT - unless it's always TDEApplication::Modifier1?
// Ditto for everywhere else where I set SHIFT & CTRL but not alt.
setAltPressed (e->stateAfter () & TQt::AltButton);
}
diff --git a/kooka/main.cpp b/kooka/main.cpp
index 7ba88610..538e17cb 100644
--- a/kooka/main.cpp
+++ b/kooka/main.cpp
@@ -84,7 +84,7 @@ int main( int argc, char *argv[] )
TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options.
- KApplication app;
+ TDEApplication app;
KGlobal::locale()->insertCatalogue("libkscan");
KImageIO::registerFormats();
KIconLoader *loader = KGlobal::iconLoader();
diff --git a/kpdf/shell/main.cpp b/kpdf/shell/main.cpp
index 6c3a351c..5009ba12 100644
--- a/kpdf/shell/main.cpp
+++ b/kpdf/shell/main.cpp
@@ -50,7 +50,7 @@ int main(int argc, char** argv)
TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options );
- KApplication app;
+ TDEApplication app;
// see if we are starting with session management
if (app.isRestored())
diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp
index 0029676e..9642f7a9 100644
--- a/kpdf/ui/pageview.cpp
+++ b/kpdf/ui/pageview.cpp
@@ -1192,7 +1192,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
if (!client->isApplicationRegistered("kttsd"))
{
TQString error;
- if (KApplication::startServiceByDesktopName("kttsd", TQStringList(), &error))
+ if (TDEApplication::startServiceByDesktopName("kttsd", TQStringList(), &error))
{
d->messageWindow->display( i18n("Starting KTTSD Failed: %1").arg(error) );
KpdfSettings::setUseKTTSD(false);
diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp
index 74800e88..865d8e50 100644
--- a/kpdf/ui/presentationwidget.cpp
+++ b/kpdf/ui/presentationwidget.cpp
@@ -890,7 +890,7 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const
}
case KpdfSettings::EnumSlidesTransition::Random:
{
- return defaultTransition( KApplication::random() % 18 );
+ return defaultTransition( TDEApplication::random() % 18 );
break;
}
case KpdfSettings::EnumSlidesTransition::SplitHorizontalIn:
diff --git a/kpovmodeler/main.cpp b/kpovmodeler/main.cpp
index c5aed527..12cbe719 100644
--- a/kpovmodeler/main.cpp
+++ b/kpovmodeler/main.cpp
@@ -42,7 +42,7 @@ int main( int argc, char* argv[] )
TDECmdLineArgs::init( argc, argv, PMFactory::aboutData( ) );
TDECmdLineArgs::addCmdLineOptions( options );
- KApplication app;
+ TDEApplication app;
TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs( );
diff --git a/kruler/main.cpp b/kruler/main.cpp
index 646e5383..13b860b7 100644
--- a/kruler/main.cpp
+++ b/kruler/main.cpp
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
- KApplication a;
+ TDEApplication a;
if (a.isRestored()) {
RESTORE_RULERS(KLineal)
diff --git a/ksnapshot/ksnapshot.cpp b/ksnapshot/ksnapshot.cpp
index f7d85254..e5237351 100644
--- a/ksnapshot/ksnapshot.cpp
+++ b/ksnapshot/ksnapshot.cpp
@@ -56,7 +56,7 @@
#include <kglobal.h>
-#define kApp KApplication::kApplication()
+#define kApp TDEApplication::kApplication()
KSnapshot::KSnapshot(TQWidget *parent, const char *name, bool grabCurrent)
: DCOPObject("interface"),
diff --git a/ksnapshot/main.cpp b/ksnapshot/main.cpp
index d503c0d5..0bf32633 100644
--- a/ksnapshot/main.cpp
+++ b/ksnapshot/main.cpp
@@ -55,7 +55,7 @@ int main(int argc, char **argv)
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
- KApplication app;
+ TDEApplication app;
KImageIO::registerFormats();
diff --git a/ksvg/test/external/printnodetest.cpp b/ksvg/test/external/printnodetest.cpp
index fa31c830..9229461d 100644
--- a/ksvg/test/external/printnodetest.cpp
+++ b/ksvg/test/external/printnodetest.cpp
@@ -56,7 +56,7 @@ int main(int argc, char **argv)
return -1;
}
- KApplication a(argc, argv);
+ TDEApplication a(argc, argv);
(void) new Worker(args->url(0));
return a.exec();
}
diff --git a/ksvg/test/external/svgdisplay.cc b/ksvg/test/external/svgdisplay.cc
index a8b4797c..b89a1f42 100644
--- a/ksvg/test/external/svgdisplay.cc
+++ b/ksvg/test/external/svgdisplay.cc
@@ -23,7 +23,7 @@ int main(int argc, char **argv)
return 0;
}
KURL url = args->url(0);
- KApplication a( argc, argv );
+ TDEApplication a( argc, argv );
SVGTestWidget *w = new SVGTestWidget(url);
a.setMainWidget(w);
w->show();
diff --git a/kuickshow/src/main.cpp b/kuickshow/src/main.cpp
index b1b5de44..36286463 100644
--- a/kuickshow/src/main.cpp
+++ b/kuickshow/src/main.cpp
@@ -52,7 +52,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
TDECmdLineArgs::init( argc, argv, &about );
TDECmdLineArgs::addCmdLineOptions( options );
- KApplication app;
+ TDEApplication app;
if ( app.isRestored() ) {
(new KuickShow())->restore( 1, false ); // don't show automatically
diff --git a/kview/kviewcanvas/test/main.cpp b/kview/kviewcanvas/test/main.cpp
index 74e1046e..bd78c8fb 100644
--- a/kview/kviewcanvas/test/main.cpp
+++ b/kview/kviewcanvas/test/main.cpp
@@ -21,7 +21,7 @@ int main(int argc, char **argv)
about.addAuthor( "Matthias Kretz", 0, "kretz@kde.org" );
TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options );
- KApplication app;
+ TDEApplication app;
if (app.isRestored())
RESTORE(KImageViewerTest)
diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp
index 12a2d4a7..b9e8af7d 100644
--- a/kview/kviewviewer/kviewviewer.cpp
+++ b/kview/kviewviewer/kviewviewer.cpp
@@ -861,7 +861,7 @@ void KViewViewer::switchBlendEffect()
m_pCanvas->setBlendEffect( 0 );
else
{
- unsigned int num = KApplication::random() % m_vEffects.size();
+ unsigned int num = TDEApplication::random() % m_vEffects.size();
m_pCanvas->setBlendEffect( m_vEffects[ num ] );
}
}
diff --git a/kview/kviewviewer/test/main.cpp b/kview/kviewviewer/test/main.cpp
index 64beafee..499e75e5 100644
--- a/kview/kviewviewer/test/main.cpp
+++ b/kview/kviewviewer/test/main.cpp
@@ -21,7 +21,7 @@ int main(int argc, char **argv)
about.addAuthor( "Matthias Kretz", 0, "kretz@kde.org" );
TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options );
- KApplication app;
+ TDEApplication app;
if (app.isRestored())
RESTORE(Test)
diff --git a/kview/main.cpp b/kview/main.cpp
index c43f0ca3..4f8266d2 100644
--- a/kview/main.cpp
+++ b/kview/main.cpp
@@ -42,7 +42,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
about.addAuthor( "Simon Hausmann", 0, "hausmann@kde.org" );
TDECmdLineArgs::init( argc, argv, &about );
TDECmdLineArgs::addCmdLineOptions( options );
- KApplication app;
+ TDEApplication app;
if( app.isRestored() )
RESTORE( KView )
diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp
index fcd2cf4f..0fc6bfe2 100644
--- a/kview/modules/presenter/kviewpresenter.cpp
+++ b/kview/modules/presenter/kviewpresenter.cpp
@@ -391,7 +391,7 @@ void KViewPresenter::shuffle()
listview->takeItem( item );
}
while( ! items.isEmpty() )
- listview->insertItem( items.take( KApplication::random() % items.count() ) );
+ listview->insertItem( items.take( TDEApplication::random() % items.count() ) );
}
void KViewPresenter::closeAll()
diff --git a/kviewshell/main.cpp b/kviewshell/main.cpp
index ec826196..95b5e9d8 100644
--- a/kviewshell/main.cpp
+++ b/kviewshell/main.cpp
@@ -64,7 +64,7 @@ int main(int argc, char **argv)
TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options.
- KApplication app;
+ TDEApplication app;
// see if we are starting with session management
if (app.isRestored())