summaryrefslogtreecommitdiffstats
path: root/kimagemapeditor
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:25:07 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:25:07 -0600
commitf7307c95135a3c1589799c6877d314a02a2260c1 (patch)
tree2defa5a196f5d9558af96b30258cbcb7969b1a93 /kimagemapeditor
parentca1ec6eeaaf5744fae891a5b0696591bbaece795 (diff)
downloadtdewebdev-f7307c95135a3c1589799c6877d314a02a2260c1.tar.gz
tdewebdev-f7307c95135a3c1589799c6877d314a02a2260c1.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kimagemapeditor')
-rw-r--r--kimagemapeditor/kimagemapeditor.cpp2
-rw-r--r--kimagemapeditor/kimagemapeditor.h4
-rw-r--r--kimagemapeditor/main.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp
index a21591e5..4ca05bc4 100644
--- a/kimagemapeditor/kimagemapeditor.cpp
+++ b/kimagemapeditor/kimagemapeditor.cpp
@@ -821,7 +821,7 @@ void KImageMapEditor::slotUpdateSelectionCoords( const TQRect & r )
kapp->processEvents();
}
-KApplication* KImageMapEditor::app() const
+TDEApplication* KImageMapEditor::app() const
{
return kapp;
}
diff --git a/kimagemapeditor/kimagemapeditor.h b/kimagemapeditor/kimagemapeditor.h
index bfe6dd98..d5462645 100644
--- a/kimagemapeditor/kimagemapeditor.h
+++ b/kimagemapeditor/kimagemapeditor.h
@@ -116,7 +116,7 @@ class KAction;
#endif
///class TQListViewItem;
class KCommandHistory;
-class KApplication;
+class TDEApplication;
class TQTabWidget;
class AreaListView;
class ImagesListView;
@@ -174,7 +174,7 @@ public :
int showTagEditor(Area *);
KCommandHistory *commandHistory() const;
- KApplication* app() const;
+ TDEApplication* app() const;
// Only refreshes the listView
void updateSelection() const;
diff --git a/kimagemapeditor/main.cpp b/kimagemapeditor/main.cpp
index 679ef7b2..c27be373 100644
--- a/kimagemapeditor/main.cpp
+++ b/kimagemapeditor/main.cpp
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
- KApplication a;
+ TDEApplication a;
a.dcopClient()->registerAs(a.name());