diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:14:36 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:14:36 -0600 |
| commit | 98ed486e2f25cfd58e6cc036862bcac0e988f361 (patch) | |
| tree | 23b89d4f0244fad16b66aeca0b23f9dd0053fc7e /kmag | |
| parent | 7c140ea1cb70b8a6ecb34454514dcf91d7bcd0c7 (diff) | |
| download | tdeaccessibility-98ed486e2f25cfd58e6cc036862bcac0e988f361.tar.gz tdeaccessibility-98ed486e2f25cfd58e6cc036862bcac0e988f361.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kmag')
| -rw-r--r-- | kmag/kmag.cpp | 2 | ||||
| -rw-r--r-- | kmag/kmag.h | 2 | ||||
| -rw-r--r-- | kmag/kmagzoomview.cpp | 6 | ||||
| -rw-r--r-- | kmag/main.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp index f345f8e..3feea65 100644 --- a/kmag/kmag.cpp +++ b/kmag/kmag.cpp @@ -864,7 +864,7 @@ void KmagApp::slotFileQuit() void KmagApp::copyToClipBoard() { - TQClipboard *cb=KApplication::clipboard(); + TQClipboard *cb=TDEApplication::clipboard(); cb->setPixmap(m_zoomView->getPixmap()); } diff --git a/kmag/kmag.h b/kmag/kmag.h index 995a6d2..51de1b8 100644 --- a/kmag/kmag.h +++ b/kmag/kmag.h @@ -48,7 +48,7 @@ * KmagApp reimplements the methods that KMainWindow provides for main window handling and supports * full session management as well as using KActions. * @see KMainWindow - * @see KApplication + * @see TDEApplication * @see KConfig * * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team. diff --git a/kmag/kmagzoomview.cpp b/kmag/kmagzoomview.cpp index a490de8..2a26b2c 100644 --- a/kmag/kmagzoomview.cpp +++ b/kmag/kmagzoomview.cpp @@ -133,7 +133,7 @@ KMagZoomView::KMagZoomView(TQWidget *parent, const char *name) m_invert(false), m_fitToWindow(true) { - KApplication::setGlobalMouseTracking(TRUE); + TDEApplication::setGlobalMouseTracking(TRUE); viewport()->setMouseTracking(TRUE); viewport()->setBackgroundMode (NoBackground); viewport()->setFocusPolicy(TQ_StrongFocus); @@ -167,7 +167,7 @@ KMagZoomView::KMagZoomView(TQWidget *parent, const char *name) KMagZoomView::~KMagZoomView() { - KApplication::setGlobalMouseTracking(FALSE); + TDEApplication::setGlobalMouseTracking(FALSE); } /** @@ -307,7 +307,7 @@ void KMagZoomView::paintMouseCursor(TQPaintDevice *dev, TQPoint mousePos) { // 3. Actual cursor // Get the current cursor type - TQWidget *dummy = KApplication::widgetAt(TQCursor::pos(), FALSE); + TQWidget *dummy = TDEApplication::widgetAt(TQCursor::pos(), FALSE); if(!dummy) break; kdDebug() << ">" << dummy->name() << ":" << dummy->cursor().shape() << "-" << endl; diff --git a/kmag/main.cpp b/kmag/main.cpp index a543029..1111722 100644 --- a/kmag/main.cpp +++ b/kmag/main.cpp @@ -62,7 +62,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()) { |