[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdevelop
From:       Matt Rogers <mattr () kde ! org>
Date:       2006-01-14 5:04:59
Message-ID: 1137215099.221483.21535.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 497884 by mattr:

compile with new snapshot.
add ignores


 M  +3 -3      lib/util/settings.cpp  
 _M            src (directory)  
 M  +1 -1      src/kdevideextension.cpp  
 M  +2 -1      src/newui/dtabwidget.cpp  


--- trunk/KDE/kdevelop/lib/util/settings.cpp #497883:497884
@@ -17,17 +17,17 @@
 QString Settings::terminalEmulatorName( KConfig & config )
 {
 	config.setGroup("TerminalEmulator");
-	bool useKDESetting = config.readEntry( "UseKDESetting", true ).toBool();
+	bool useKDESetting = config.readEntry( "UseKDESetting", true );
 	QString terminal;
 		
 	if ( useKDESetting )
 	{
 		KConfigGroup confGroup( KGlobal::config(), QLatin1String("General") );
-		terminal = confGroup.readEntry("TerminalApplication", "konsole");
+		terminal = confGroup.readEntry( QLatin1String("TerminalApplication"), \
QString("konsole"));  }
 	else
 	{
-		terminal = config.readEntry( "TerminalApplication", "konsole");
+		terminal = config.readEntry( QLatin1String("TerminalApplication"), \
QString("konsole"));  }
 	return terminal;
 }
** trunk/KDE/kdevelop/src #property svn:ignore
   - Makefile.in
Makefile
gideon
   + .deps
Doxyfile
gideon
kdevassistant
kdevelop
.libs
Makefile
Makefile.in
*.moc
--- trunk/KDE/kdevelop/src/kdevideextension.cpp #497883:497884
@@ -71,7 +71,7 @@
 
     config->setGroup("TerminalEmulator");
     gsw->terminalButtonGroup->setButton( config->readNumEntry( "UseKDESetting", 0 ) \
                );
-    gsw->terminalEdit->setText( config->readEntry( "TerminalApplication", "konsole" \
) ); +    gsw->terminalEdit->setText( config->readEntry( \
QLatin1String("TerminalApplication"), QString("konsole") ) );  }
 
 void KDevIDEExtension::acceptGlobalSettingsPage(KDialogBase *dlg)
--- trunk/KDE/kdevelop/src/newui/dtabwidget.cpp #497883:497884
@@ -28,8 +28,9 @@
 #include <kglobal.h>
 
 DTabWidget::DTabWidget(QWidget *parent, const char *name)
-    :KTabWidget(parent, name), m_closeButton(0)
+    :KTabWidget(parent), m_closeButton(0)
 {
+    setObjectName( name );
     setFocusPolicy(Qt::NoFocus);
     setMargin(0);
 


[prev in list] [next in list] [prev in thread] [next in thread]