summaryrefslogtreecommitdiffstats
path: root/vcs
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:24:38 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:24:38 -0600
commit95e28f5bcadbf0ac052c4f29d77b4ab5e6648d1b (patch)
tree4c22f2f3096672431df9180a0946c137012f3f2c /vcs
parentbdeb717137b6fc8693198008ccb97f8213973416 (diff)
downloadtdevelop-95e28f5bcadbf0ac052c4f29d77b4ab5e6648d1b.tar.gz
tdevelop-95e28f5bcadbf0ac052c4f29d77b4ab5e6648d1b.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'vcs')
-rw-r--r--vcs/cvsservice/cvspartimpl.cpp2
-rw-r--r--vcs/cvsservice/integrator/integratordlg.cpp4
-rw-r--r--vcs/subversion/subversion_core.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/vcs/cvsservice/cvspartimpl.cpp b/vcs/cvsservice/cvspartimpl.cpp
index 7bacf3e1..0210ad0a 100644
--- a/vcs/cvsservice/cvspartimpl.cpp
+++ b/vcs/cvsservice/cvspartimpl.cpp
@@ -785,7 +785,7 @@ bool CvsServicePartImpl::requestCvsService()
TQCString appId;
TQString error;
- if (KApplication::startServiceByDesktopName( "cvsservice",
+ if (TDEApplication::startServiceByDesktopName( "cvsservice",
TQStringList(), &error, &appId ))
{
TQString msg = i18n( "Unable to find the Cervisia KPart. \n"
diff --git a/vcs/cvsservice/integrator/integratordlg.cpp b/vcs/cvsservice/integrator/integratordlg.cpp
index b7c30023..42ddff6e 100644
--- a/vcs/cvsservice/integrator/integratordlg.cpp
+++ b/vcs/cvsservice/integrator/integratordlg.cpp
@@ -95,7 +95,7 @@ void IntegratorDlg::login_clicked()
TQCString appId;
TQString error;
- if (KApplication::startServiceByDesktopName("cvsservice",
+ if (TDEApplication::startServiceByDesktopName("cvsservice",
TQStringList(), &error, &appId))
{
TQString msg = i18n("Unable to find the Cervisia KPart. \n"
@@ -154,7 +154,7 @@ void IntegratorDlg::accept()
/* TQCString appId;
TQString error;
- if (KApplication::startServiceByDesktopName("cvsservice",
+ if (TDEApplication::startServiceByDesktopName("cvsservice",
TQStringList(), &error, &appId))
{
TQString msg = i18n("Unable to find the Cervisia KPart. \n"
diff --git a/vcs/subversion/subversion_core.h b/vcs/subversion/subversion_core.h
index ecedcb90..b2f6ba41 100644
--- a/vcs/subversion/subversion_core.h
+++ b/vcs/subversion/subversion_core.h
@@ -32,7 +32,7 @@
class KDevProject;
class subversionPart;
class subversionWidget;
-class KApplication;
+class TDEApplication;
class SvnBlameHolder;
class SvnLogHolder;
class SvnLogViewWidget;