summaryrefslogtreecommitdiffstats
path: root/vcs/perforce
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:22:57 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:22:57 -0600
commit5be945600e2d7776e74663f56c2a25a8f57d7891 (patch)
tree9be5ab8203c0769df4dc0f314c45e52fa5ecfd8c /vcs/perforce
parente36b30d13d1f89100fae656adfde2b52234d12b6 (diff)
downloadtdevelop-5be945600e2d7776e74663f56c2a25a8f57d7891.tar.gz
tdevelop-5be945600e2d7776e74663f56c2a25a8f57d7891.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'vcs/perforce')
-rw-r--r--vcs/perforce/commitdlg.h2
-rw-r--r--vcs/perforce/perforcepart.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/vcs/perforce/commitdlg.h b/vcs/perforce/commitdlg.h
index ce870185..0bd98d71 100644
--- a/vcs/perforce/commitdlg.h
+++ b/vcs/perforce/commitdlg.h
@@ -16,7 +16,7 @@
#include <tqstringlist.h>
#include <tqtextedit.h>
#include <klineedit.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <kdialogbase.h>
class TDEProcess;
diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp
index 19df30a7..bd19bb54 100644
--- a/vcs/perforce/perforcepart.cpp
+++ b/vcs/perforce/perforcepart.cpp
@@ -15,13 +15,13 @@
#include <tqfileinfo.h>
#include <tqpopupmenu.h>
#include <tqregexp.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kdebug.h>
#include <kdevgenericfactory.h>
#include <kprocess.h>
#include <kmessagebox.h>
#include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kurl.h>
#include <tdeparts/part.h>