Commit a210eb0a authored by Robert Knight's avatar Robert Knight
Browse files

Various EBN fixes. Mostly include order tidy-ups.

svn path=/trunk/KDE/kdebase/apps/; revision=667653
parent 6ecd9d55
......@@ -469,7 +469,7 @@ void KonqKfmIconView::slotPreview( bool toggle )
bool previewRunning = m_pIconView->isPreviewRunning();
if ( previewRunning )
m_pIconView->stopImagePreview();
m_pIconView->setIcons( m_pIconView->iconSize(), QStringList() += "*" );
m_pIconView->setIcons( m_pIconView->iconSize(), QStringList() += '*' );
}
else
{
......
......@@ -17,11 +17,17 @@
Boston, MA 02110-1301, USA.
*/
// Own
#include "konq_combo.h"
// Qt
#include <QtGui/QPainter>
#include <QtGui/QStyle>
#include <QtGui/QPixmap>
#include <QtGui/QKeyEvent>
#include <QtCore/QEvent>
// KDE
#include <kapplication.h>
#include <kconfig.h>
#include <kconfiggroup.h>
......@@ -35,8 +41,8 @@
#include <konq_mainwindow.h>
#include <kstringhandler.h>
// Local
#include "konq_view.h"
#include "konq_combo.h"
#include "KonquerorAdaptor.h"
#include "konqueror_interface.h"
......
......@@ -14,11 +14,15 @@
*************************************************************************
*/
// Own
#include "konq_extensionmanager.h"
// Qt
#include <QtGui/QLayout>
#include <QtCore/QTimer>
//Added by qt3to4:
#include <QtGui/QBoxLayout>
// KDE
#include <kconfig.h>
#include <kdebug.h>
#include <klocale.h>
......@@ -30,8 +34,8 @@
#include <ksettings/dispatcher.h>
#include <kstandardguiitem.h>
// Local
#include "konq_view.h"
#include "konq_extensionmanager.h"
#include "konq_mainwindow.h"
......
......@@ -19,24 +19,31 @@
*/
#include <kparts/factory.h>
// Own
#include "konq_factory.h"
#include "version.h"
#include <konq_view.h>
#include <konq_settings.h>
#include <konq_mainwindow.h>
#include <kdebug.h>
// std
#include <assert.h>
// Qt
#include <QtGui/QWidget>
#include <QtCore/QFile>
// KDE
#include <kaboutdata.h>
#include <kdebug.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kmimetypetrader.h>
#include <kparts/factory.h>
#include <kservicetypetrader.h>
#include <QtGui/QWidget>
#include <QtCore/QFile>
// Local
#include "version.h"
#include <konq_view.h>
#include <konq_settings.h>
#include <konq_mainwindow.h>
#include <assert.h>
KAboutData *KonqFactory::s_aboutData = 0;
......
......@@ -16,36 +16,43 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#include "konq_events.h"
// Own
#include "konq_frame.h"
#include "konq_tabs.h"
#include "konq_view.h"
#include "konq_viewmgr.h"
#include <konq_pixmapprovider.h>
#include <kactioncollection.h>
#include <kapplication.h>
#include <kdebug.h>
#include <kicon.h>
#include <kiconloader.h>
#include <klocale.h>
#include <ksqueezedtextlabel.h>
#include <kstandardshortcut.h>
// std
#include <assert.h>
// Qt
#include <QtGui/QPainter>
#include <QtGui/QToolButton>
#include <QtGui/QTabBar>
#include <QtGui/QMenu>
#include <QtGui/QKeySequence>
#include <QtGui/QProgressBar>
//Added by qt3to4:
#include <QtGui/QPixmap>
#include <QtGui/QKeyEvent>
#include <QtCore/QEvent>
#include <QtGui/QLabel>
#include <QtGui/QBoxLayout>
#include <assert.h>
// KDE
#include <konq_pixmapprovider.h>
#include <kactioncollection.h>
#include <kapplication.h>
#include <kdebug.h>
#include <kicon.h>
#include <kiconloader.h>
#include <klocale.h>
#include <ksqueezedtextlabel.h>
#include <kstandardshortcut.h>
// Local
#include "konq_events.h"
#include "konq_tabs.h"
#include "konq_view.h"
#include "konq_viewmgr.h"
#define DEFAULT_HEADER_HEIGHT 13
......@@ -334,7 +341,7 @@ void KonqFrame::saveConfig( KConfigGroup& config, const QString &prefix, bool sa
//config.writeEntry( QString::fromLatin1( "ShowStatusBar" ).prepend( prefix ), statusbar()->isVisible() );
if (this == docContainer) config.writeEntry( QString::fromLatin1( "docContainer" ).prepend( prefix ), true );
KonqConfigEvent ev( config.config(), prefix+"_", true/*save*/);
KonqConfigEvent ev( config.config(), prefix+'_', true/*save*/);
QApplication::sendEvent( childView()->part(), &ev );
}
......
......@@ -204,7 +204,7 @@ class KonqFrame : public QWidget, public KonqFrameBase
Q_OBJECT
public:
KonqFrame( QWidget* parent, KonqFrameContainerBase *parentContainer = 0L );
explicit KonqFrame( QWidget* parent, KonqFrameContainerBase *parentContainer = 0L );
virtual ~KonqFrame();
/**
......
......@@ -17,6 +17,10 @@
Boston, MA 02110-1301, USA.
*/
// Own
#include "konq_guiclients.h"
// KDE
#include <kdebug.h>
#include <kicon.h>
#include <kiconloader.h>
......@@ -25,10 +29,10 @@
#include <kactioncollection.h>
#include <kservicetypetrader.h>
// Local
#include "konq_view.h"
#include "konq_settingsxt.h"
#include "konq_frame.h"
#include "konq_guiclients.h"
#include "konq_viewmgr.h"
PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow,
......
......@@ -20,9 +20,11 @@
#ifndef __konq_guiclients_h__
#define __konq_guiclients_h__
#include <kxmlguiclient.h>
#include <QtCore/QObject>
#include <QtCore/QHash>
#include <QtXml/QDomDocument>
#include <kxmlguiclient.h>
#include <kservice.h>
class QAction;
......
......@@ -1347,7 +1347,7 @@ void KonqMainWindow::slotSendFile()
}
QDir().mkdir(zipFileName);
zipFileName = zipFileName+"/"+(*it).fileName()+".zip";
zipFileName = zipFileName+'/'+(*it).fileName()+".zip";
KZip zip( zipFileName );
if ( !zip.open( QIODevice::WriteOnly ) )
continue; // TODO error message
......@@ -6024,5 +6024,6 @@ void KonqMainWindow::restoreWindowSize()
#include "konq_mainwindow.moc"
/* vim: et sw=4 ts=4
*/
......@@ -111,7 +111,9 @@ public:
enum ComboAction { ComboClear, ComboAdd, ComboRemove };
enum PageSecurity { NotCrypted, Encrypted, Mixed };
KonqMainWindow( const KUrl &initialURL = KUrl(), bool openInitialURL = true, const QString& xmluiFile="konqueror.rc");
explicit KonqMainWindow( const KUrl &initialURL = KUrl(),
bool openInitialURL = true,
const QString& xmluiFile="konqueror.rc");
~KonqMainWindow();
......
......@@ -17,16 +17,21 @@
Boston, MA 02110-1301, USA.
*/
#include <kdebug.h>
// Own
#include "konq_run.h"
#include "konq_view.h"
// std
#include <assert.h>
// KDE
#include <kdebug.h>
#include <kmessagebox.h>
#include <klocale.h>
// Local
#include "konq_view.h"
#include <konq_historymgr.h>
#include <assert.h>
#define HINT_UTF8 106
......
......@@ -198,7 +198,7 @@ void KonqFrameTabs::saveConfig( KConfigGroup& config, const QString &prefix, boo
QString newPrefix;
foreach (KonqFrameBase* frame, *m_pChildFrameList)
{
newPrefix = QString::fromLatin1( frame->frameType() ) + "T" + QString::number(i);
newPrefix = QString::fromLatin1( frame->frameType() ) + 'T' + QString::number(i);
strlst.append( newPrefix );
newPrefix.append( QLatin1Char( '_' ) );
frame->saveConfig( config, newPrefix, saveURLs, docContainer, id, depth + i );
......
......@@ -1528,7 +1528,7 @@ void KonqViewManager::loadItem( KConfigGroup &cfg, KonqFrameContainerBase *paren
}
}
}
KonqConfigEvent ev( cfg.config(), prefix+"_", false/*load*/);
KonqConfigEvent ev( cfg.config(), prefix+'_', false/*load*/);
QApplication::sendEvent( childView->part(), &ev );
childView->frame()->show();
......
......@@ -12,26 +12,31 @@
* *
***************************************************************************/
#include <khtml_part.h> // this plugin applies to a khtml part
// Own
#include "khtmlkttsd.h"
// Qt
#include <QtCore/QBuffer>
#include <QtCore/QTimer>
#include <QtDBus>
#include <QtGui/QMessageBox>
// KDE
#include <dom/dom_string.h>
#include <dom/html_document.h>
#include <dom/html_element.h>
#include <dom/dom_string.h>
#include <kdebug.h>
#include "khtmlkttsd.h"
#include <kaction.h>
#include <kactioncollection.h>
#include <kapplication.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <khtml_part.h> // this plugin applies to a khtml part
#include <kicon.h>
#include <kiconloader.h>
#include <QtGui/QMessageBox>
#include <klocale.h>
#include <QtCore/QTimer>
#include <kspeech.h>
#include <QtCore/QBuffer>
#include <QtDBus>
#include <kapplication.h>
#include <kmessagebox.h>
#include <kservicetypetrader.h>
#include <kspeech.h>
#include <ktoolinvocation.h>
KHTMLPluginKTTSD::KHTMLPluginKTTSD( QObject* parent, const QStringList& )
......
......@@ -17,20 +17,29 @@
*/
#include "konq_listview.h"
#include <kapplication.h>
#include <konq_settings.h>
#include <kfilemetainfo.h>
#include <kdebug.h>
#include <klocale.h>
// Own
#include "konq_infolistviewitem.h"
// std
#include <assert.h>
#include <stdio.h>
#include <QtGui/QPainter>
// Qt
#include <Qt3Support/Q3Header>
#include <QtCore/QDate>
#include <QtGui/QPainter>
// KDE
#include <kapplication.h>
#include <kdebug.h>
#include <kfilemetainfo.h>
#include <klocale.h>
#include <konq_settings.h>
#include <kiconloader.h>
#include "konq_infolistviewitem.h"
// Local
#include "konq_listview.h"
#include "konq_infolistviewwidget.h"
#include <QtCore/QDate>
/**************************************************************
*
......
......@@ -106,9 +106,9 @@ void KonqListViewItem::updateContents()
break;
case KIO::UDS_SIZE:
if ( m_pListViewWidget->m_pSettings->fileSizeInBytes() )
setText(tmpColumn->displayInColumn,KGlobal::locale()->formatNumber( m_fileitem->size(),0)+" ");
setText(tmpColumn->displayInColumn,KGlobal::locale()->formatNumber( m_fileitem->size(),0)+' ');
else
setText(tmpColumn->displayInColumn,KIO::convertSize(m_fileitem->size())+" ");
setText(tmpColumn->displayInColumn,KIO::convertSize(m_fileitem->size())+' ');
break;
case KIO::UDS_ACCESS:
setText(tmpColumn->displayInColumn,makeAccessString(m_fileitem->permissions()));
......
......@@ -18,34 +18,41 @@
Boston, MA 02110-1301, USA.
*/
#include "konq_listview.h"
#include "konq_listviewsettings.h"
// Own
#include "konq_listviewwidget.h"
#include <konq_filetip.h>
#include <konq_settings.h>
#include <kdebug.h>
#include <kdirlister.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kprotocolinfo.h>
#include <kprotocolmanager.h>
#include <kmessagebox.h>
#include <ktoggleaction.h>
// std
#include <stdlib.h>
#include <assert.h>
// Qt
#include <Qt3Support/Q3Header>
#include <QtGui/QPainter>
#include <QtGui/QStyle>
#include <QtCore/QTimer>
#include <QtCore/QEvent>
#include <QtGui/QCursor>
#include <QtGui/QDrag>
#include <stdlib.h>
#include <assert.h>
// KDE
#include <kdebug.h>
#include <kdirlister.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kprotocolinfo.h>
#include <kprotocolmanager.h>
#include <kmessagebox.h>
#include <ktoggleaction.h>
// Local
#include "konq_listview.h"
#include "konq_listviewsettings.h"
#include <konq_filetip.h>
#include <konq_settings.h>
#include <konqmimedata.h>
ColumnInfo::ColumnInfo()
:displayInColumn(-1)
,name()
......
......@@ -172,9 +172,9 @@ void KonqTextViewItem::updateContents()
break;
case KIO::UDS_SIZE:
if ( static_cast<KonqBaseListViewWidget *>(listView())->m_pSettings->fileSizeInBytes() )
setText(tmpColumn->displayInColumn,KGlobal::locale()->formatNumber(size, 0)+" ");
setText(tmpColumn->displayInColumn,KGlobal::locale()->formatNumber(size, 0)+' ');
else
setText(tmpColumn->displayInColumn,KIO::convertSize(size)+" ");
setText(tmpColumn->displayInColumn,KIO::convertSize(size)+' ');
break;
case KIO::UDS_ACCESS:
setText(tmpColumn->displayInColumn,makeAccessString(m_fileitem->permissions()));
......
......@@ -18,12 +18,16 @@
Boston, MA 02110-1301, USA.
*/
#include "konq_listview.h"
// Own
#include "konq_treeviewwidget.h"
// KDE
#include <kdirlister.h>
#include <kdebug.h>
// Local
#include "konq_listview.h"
template class Q3Dict<KonqListViewDir>;
......
// Own
#include "kcmcss.h"
// Qt
#include <QtGui/QCheckBox>
#include <QtGui/QComboBox>
#include <QtGui/QLayout>
#include <QtGui/QRadioButton>
#include <Qt3Support/Q3TextBrowser>
//Added by qt3to4:
#include <QtGui/QBoxLayout>
// KDE
#include <kapplication.h>
#include <kcolorbutton.h>
#include <kconfig.h>
......@@ -17,10 +21,9 @@
#include <kstandarddirs.h>
#include <kurlrequester.h>
// Local
#include "template.h"
#include "kcmcss.h"
typedef KGenericFactory<CSSConfig, QWidget> CSSFactory;
K_EXPORT_COMPONENT_FACTORY( css, CSSFactory("kcmcss") )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment