TQt4 port kdevelop

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 15 insertions, 15 deletions

diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp
index e07656b9..e8fbecff 100644
--- a/parts/filecreate/filecreate_part.cpp
+++ b/parts/filecreate/filecreate_part.cpp
@@ -61,9 +61,9 @@ K_EXPORT_COMPONENT_FACTORY( libkdevfilecreate, FileCreateFactory( data ) )
 
 using namespace FileCreate;
 
-FileCreatePart::FileCreatePart(TQObject *parent, const char *name, const TQStringList & )
-//    : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0)
-    : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_subPopups(0)
+FileCreatePart::FileCreatePart(TQObject *tqparent, const char *name, const TQStringList & )
+//    : KDevCreateFile(&data, tqparent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0)
+    : KDevCreateFile(&data, tqparent, name ? name : "FileCreatePart"), m_subPopups(0)
 {
   setInstance(FileCreateFactory::instance());
   setXMLFile("kdevpart_filecreate.rc");
@@ -78,7 +78,7 @@ FileCreatePart::FileCreatePart(TQObject *parent, const char *name, const TQStrin
 		this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) );
 
 
-  KToolBarPopupAction * newAction = new KToolBarPopupAction( i18n("&New"), "filenew", CTRL+Qt::Key_N, this, TQT_SLOT(slotNewFile()), actionCollection(), "file_new");
+  KToolBarPopupAction * newAction = new KToolBarPopupAction( i18n("&New"), "filenew", CTRL+TQt::Key_N, this, TQT_SLOT(slotNewFile()), actionCollection(), "file_new");
   newAction->setWhatsThis( i18n("<b>New file</b><p>Creates a new file. Also adds it the project if the <b>Add to project</b> checkbox is turned on.") );
   newAction->setToolTip( i18n("Create a new file") );
   m_newPopupMenu = newAction->popupMenu();
@@ -210,8 +210,8 @@ void FileCreatePart::slotProjectClosed() {
 void FileCreatePart::slotFiletypeSelected(const FileType * filetype) {
 
   KDevCreateFile::CreatedFile createdFile = createNewFile(filetype->ext(),
-                                                          TQString::null,
-                                                          TQString::null,
+                                                          TQString(),
+                                                          TQString(),
                                                           filetype->subtypeRef());
 
   openCreatedFile(createdFile);
@@ -274,7 +274,7 @@ FileType * FileCreatePart::getType(const TQString & ex, const TQString subtRef)
 
   TQString subtypeRef = subtRef;
   TQString ext = ex;
-  int dashPos = ext.find('-');
+  int dashPos = ext.tqfind('-');
   if (dashPos>-1 && subtRef.isNull()) {
     ext = ex.left(dashPos);
     subtypeRef = ex.mid(dashPos+1);
@@ -301,7 +301,7 @@ FileType * FileCreatePart::getEnabledType(const TQString & ex, const TQString su
 
   TQString subtypeRef = subtRef;
   TQString ext = ex;
-  int dashPos = ext.find('-');
+  int dashPos = ext.tqfind('-');
   if (dashPos>-1 && subtRef.isNull()) {
     ext = ex.left(dashPos);
     subtypeRef = ex.mid(dashPos+1);
@@ -383,7 +383,7 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString
   selectedURL = dialog.url();
   const FileType *selectedFileType = dialog.selectedType();
 
-  if (dialog.addToProject() && !projectURL.isParentOf(selectedURL) && !(project()->options() & KDevProject::UsesQMakeBuildSystem) ) {
+  if (dialog.addToProject() && !projectURL.isParentOf(selectedURL) && !(project()->options() & KDevProject::UsesTQMakeBuildSystem) ) {
     result.status = KDevCreateFile::CreatedFile::STATUS_NOTWITHINPROJECT;
     return result;
   }
@@ -425,7 +425,7 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString
     // work out the path relative to the project directory
 //    TQString relToProj = URLUtil::relativePath(projectURL, selectedURL, URLUtil::SLASH_PREFIX );
 	  TQString relToProj;
-	  if( project()->options() & KDevProject::UsesQMakeBuildSystem )
+	  if( project()->options() & KDevProject::UsesTQMakeBuildSystem )
 	  {
 		relToProj = URLUtil::relativePathToFile( project()->projectDirectory(), fullPath );
 		  project()->addFile(relToProj);
@@ -451,7 +451,7 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString
 }
 
 void FileCreatePart::slotNoteFiletype(const FileType * filetype) {
-  kdDebug(9034) << "Noting file type: " << (filetype ? filetype->ext() : TQString::fromLatin1("Null") ) << endl;
+  kdDebug(9034) << "Noting file type: " << (filetype ? filetype->ext() : TQString::tqfromLatin1("Null") ) << endl;
   m_filedialogFiletype = filetype;
 }
 
@@ -483,7 +483,7 @@ void FileCreatePart::slotInitialize( )
         }
       } else {
         // if an extension + subtype have been specified, enable
-        // the subtype and the extension (the 'parent')
+        // the subtype and the extension (the 'tqparent')
         FileType * filetype = getType(ext);
         FileType * subtype = getType(ext,subtyperef);
         if (filetype && subtype) {
@@ -501,9 +501,9 @@ void FileCreatePart::slotInitialize( )
     TQDir templDir( project()->projectDirectory() + "/templates/" );
     if (templDir.exists()) {
       templDir.setFilter( TQDir::Files );
-      const QFileInfoList * list = templDir.entryInfoList();
+      const TQFileInfoList * list = templDir.entryInfoList();
       if( list ){
-        QFileInfoListIterator it( *list );
+        TQFileInfoListIterator it( *list );
         TQFileInfo *fi;
         while ( (fi = it.current()) != 0 ) {
           addFileType(fi->fileName());
@@ -559,4 +559,4 @@ void FileCreatePart::slotGlobalInitialize( )
 
 #include "filecreate_part.moc"
 
-// kate: indent-width 2; replace-tabs on; tab-width 4; space-indent on;
+// kate: indent-width 2; tqreplace-tabs on; tab-width 4; space-indent on;