From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 14 Jun 2011 16:45:05 +0000
Subject: 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
---
 src/generalinfowidget.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/generalinfowidget.cpp')

diff --git a/src/generalinfowidget.cpp b/src/generalinfowidget.cpp
index fdc53eff..e1257537 100644
--- a/src/generalinfowidget.cpp
+++ b/src/generalinfowidget.cpp
@@ -29,8 +29,8 @@
 
 TQString makeRelativePath(const TQString& fromPath, const TQString& toPath);
 
-GeneralInfoWidget::GeneralInfoWidget(TQDomDocument &projectDom, TQWidget *parent, const char *name)
-        : GeneralInfoWidgetBase(parent, name), m_projectDom(projectDom) {
+GeneralInfoWidget::GeneralInfoWidget(TQDomDocument &projectDom, TQWidget *tqparent, const char *name)
+        : GeneralInfoWidgetBase(tqparent, name), m_projectDom(projectDom) {
 
     connect(project_directory_edit, TQT_SIGNAL(textChanged(const TQString&)),
             this, TQT_SLOT(slotProjectDirectoryChanged(const TQString&)));
@@ -65,8 +65,8 @@ void GeneralInfoWidget::readConfig() {
     }
     encoding_combo->setCurrentItem( 0 );
 
-//    const TQString DefaultEncoding = KGlobal::charsets()->encodingForName( DomUtil::readEntry( m_projectDom, "/general/defaultencoding", TQString::null ) );
-    const TQString DefaultEncoding = DomUtil::readEntry( m_projectDom, "/general/defaultencoding", TQString::null );
+//    const TQString DefaultEncoding = KGlobal::charsets()->encodingForName( DomUtil::readEntry( m_projectDom, "/general/defaultencoding", TQString() ) );
+    const TQString DefaultEncoding = DomUtil::readEntry( m_projectDom, "/general/defaultencoding", TQString() );
     for ( int i = 0; i < encoding_combo->count(); i++ )
     {
         if ( KGlobal::charsets()->encodingForName( encoding_combo->text( i ) ) == DefaultEncoding )
@@ -92,7 +92,7 @@ void GeneralInfoWidget::configureinUpdateVersion( TQString configureinpath, TQSt
     TQFile configurein(configureinpath);
 
     if ( !configurein.open( IO_ReadOnly ) ){
-        KMessageBox::error(this, i18n("Could not open %1 for reading.").arg(configureinpath));
+        KMessageBox::error(this, i18n("Could not open %1 for reading.").tqarg(configureinpath));
         return;
     }
 
@@ -152,7 +152,7 @@ void GeneralInfoWidget::configureinUpdateVersion( TQString configureinpath, TQSt
     // write our changes..
     TQFile configureout(configureinpath);
     if ( !configureout.open( IO_WriteOnly ) ){
-        KMessageBox::error(this, i18n("Could not open %1 for writing.").arg(configureinpath));
+        KMessageBox::error(this, i18n("Could not open %1 for writing.").tqarg(configureinpath));
         return ;
     }
     TQTextStream output( &configureout);
@@ -189,7 +189,7 @@ void GeneralInfoWidget::writeConfig() {
     DomUtil::writeEntry(m_projectDom,"/general/version",version_edit->text());
     DomUtil::writeEntry(m_projectDom,"/general/description",description_edit->text());
 
-    TQString DefaultEncoding = TQString::null;
+    TQString DefaultEncoding = TQString();
     if ( encoding_combo->currentItem() > 0 )
     {
         DefaultEncoding = KGlobal::charsets()->encodingForName( encoding_combo->currentText() );
@@ -217,13 +217,13 @@ void GeneralInfoWidget::slotProjectDirectoryChanged( const TQString& text ) {
     else if(isProjectDirectoryAbsolute() && text[0] != '/')
     {
        setProjectDirectoryError(
-           i18n("'%1' is not an absolute path.").arg(
+           i18n("'%1' is not an absolute path.").tqarg(
                project_directory_edit->text()));
     }
     else if(!isProjectDirectoryAbsolute() && text[0] == '/')
     {
        setProjectDirectoryError(
-           i18n("'%1' is not a relative path.").arg(
+           i18n("'%1' is not a relative path.").tqarg(
                project_directory_edit->text()));
     }
     else
@@ -231,11 +231,11 @@ void GeneralInfoWidget::slotProjectDirectoryChanged( const TQString& text ) {
         TQFileInfo info(projectDirectory());
         if(!info.exists())
            setProjectDirectoryError(
-               i18n("'%1' does not exist.").arg(
+               i18n("'%1' does not exist.").tqarg(
                    project_directory_edit->text()));
         else if(!info.isDir())
            setProjectDirectoryError(
-               i18n("'%1' is not a directory.").arg(
+               i18n("'%1' is not a directory.").tqarg(
                    project_directory_edit->text()));
         else
            setProjectDirectorySuccess();
@@ -261,10 +261,10 @@ void GeneralInfoWidget::setProjectDirectorySuccess() {
     project_directory_diagnostic_icon->setPixmap(SmallIcon("ok"));
     if(isProjectDirectoryAbsolute())
         project_directory_diagnostic_label->setText(
-            i18n("'%1' is a valid project directory.").arg(projectDirectory()));
+            i18n("'%1' is a valid project directory.").tqarg(projectDirectory()));
     else
         project_directory_diagnostic_label->setText(
-            i18n("'%1' is a valid project directory.").arg(projectDirectory()));
+            i18n("'%1' is a valid project directory.").tqarg(projectDirectory()));
 }
 
 TQString makeRelativePath(const TQString& fromPath, const TQString& toPath)
-- 
cgit v1.2.1