Commit d8e6b83b authored by Dirk Mueller's avatar Dirk Mueller
Browse files

unbreak compilation (gcc 3.4+)

svn path=/trunk/kdebase/kdialog/; revision=239225
parent 6cb15c6e
......@@ -32,6 +32,6 @@ namespace Widgets
bool listBox(QWidget *parent, const QString& title, const QString& text, const QStringList& args, QString &result);
bool checkList(QWidget *parent, const QString& title, const QString& text, const QStringList& args, bool separateOutput, QStringList &result);
bool radioBox(QWidget *parent, const QString& title, const QString& text, const QStringList& args, QString &result);
};
}
#endif
......@@ -31,7 +31,7 @@
class KonqDirPart;
typedef KParts::GenericFactory<KFindPart> KFindFactory;
K_EXPORT_COMPONENT_FACTORY( libkfindpart, KFindFactory );
K_EXPORT_COMPONENT_FACTORY( libkfindpart, KFindFactory )
KFindPart::KFindPart( QWidget * parentWidget, const char *widgetName,
QObject *parent, const char *name ,
......
......@@ -151,7 +151,7 @@ QString KfindWindow::reducedDir(const QString& fullDir)
return tmp;
};
return fullDir;
};
}
void KfindWindow::beginSearch(const KURL& baseUrl)
{
......
......@@ -108,7 +108,7 @@ extern "C"
{
return new KonqIconViewFactory;
}
};
}
IconViewBrowserExtension::IconViewBrowserExtension( KonqKfmIconView *iconView )
: KonqDirPartBrowserExtension( iconView )
......
......@@ -403,7 +403,7 @@ bool KonqFrame::eventFilter(QObject* /*obj*/, QEvent *ev)
};
};
return false;
};
}
void KonqFrame::insertTopWidget( QWidget * widget )
{
......@@ -421,7 +421,7 @@ void KonqFrame::setView( KonqView* child )
connect(m_pView,SIGNAL(sigPartChanged(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *)),
m_pStatusBar,SLOT(slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *)));
}
};
}
void KonqFrame::setTitle( const QString &title , QWidget* /*sender*/)
{
......
......@@ -55,7 +55,7 @@ class KSqueezedTextLabel;
namespace KParts
{
class ReadOnlyPart;
};
}
/**
* A CheckBox with a special paintEvent(). It looks like the
......
......@@ -2812,7 +2812,7 @@ void KonqMainWindow::slotCtrlTabPressed()
KonqView * view = m_pViewManager->chooseNextView( m_currentView );
if ( view )
m_pViewManager->setActivePart( view->part() );
};
}
void KonqMainWindow::slotClearHistory()
{
......
......@@ -78,7 +78,7 @@ namespace KParts {
class BrowserHostExtension;
class ReadOnlyPart;
struct URLArgs;
};
}
class KonqExtendedBookmarkOwner;
......
......@@ -47,7 +47,7 @@ class KActionMenu;
namespace KParts
{
class ReadOnlyPart;
};
}
class KonqViewManager : public KParts::PartManager
{
......
......@@ -25,7 +25,7 @@
#include <qmap.h>
#include <qpair.h>
namespace KIO {class MetaInfoJob;};
namespace KIO {class MetaInfoJob;}
class KonqListView;
class KSelectAction;
......
......@@ -271,7 +271,7 @@ void KonqListView::guiActivateEvent( KParts::GUIActivateEvent *event )
KonqDirPart::guiActivateEvent(event );
//ReadOnlyPart::guiActivateEvent(event );
((ListViewBrowserExtension*)m_extension)->updateActions();
};
}
bool KonqListView::doOpenURL( const KURL &url )
{
......@@ -505,7 +505,7 @@ void KonqListView::slotHeaderClicked(int sec)
config->writeEntry("SortBy",nameOfSortColumn);
config->writeEntry("SortOrder",m_pListView->ascending());
config->sync();
};
}
void KonqListView::headerDragged(int sec, int from, int to)
{
......
......@@ -48,7 +48,7 @@ ColumnInfo::ColumnInfo()
,udsId(0)
,displayThisOne(FALSE)
,toggleThisOne(0)
{};
{}
ColumnInfo::ColumnInfo(const char* n, const char* desktopName, int kioUds,int count,bool enabled,KToggleAction* someAction)
......@@ -68,7 +68,7 @@ void ColumnInfo::setData(const char* n, const char* desktopName, int kioUds,int
udsId=kioUds;
displayThisOne=enabled;
toggleThisOne=someAction;
};
}
KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, QWidget *parentWidget)
......
......@@ -56,7 +56,7 @@ QString KonqTextViewItem::key( int _column, bool asc) const
};
tmp+=text(_column);
return tmp;
};
}
void KonqTextViewItem::updateContents()
{
......@@ -187,7 +187,7 @@ void KonqTextViewItem::updateContents()
};
};
};
};
}
void KonqTextViewItem::paintCell( QPainter *_painter, const QColorGroup & _cg, int _column, int _width, int _alignment )
{
......@@ -217,4 +217,4 @@ void KonqTextViewItem::setup()
int h(listView()->fontMetrics().height());
if ( h % 2 > 0 ) h++;
setHeight(h);
};
}
......@@ -137,7 +137,7 @@ void KonqTextViewWidget::createColumns()
if (sortedByColumn=="FileName")
setSorting(0,m_bAscending);
};
}
void KonqTextViewWidget::slotNewItems( const KFileItemList & entries )
{
......
......@@ -40,32 +40,32 @@ extern "C"
KCModule *create_cookie(QWidget *parent, const char /**name*/)
{
return new KCookiesMain(parent);
};
}
KCModule *create_smb(QWidget *parent, const char /**name*/)
{
return new SMBRoOptions(parent);
};
}
KCModule *create_useragent(QWidget *parent, const char /**name*/)
{
return new UserAgentDlg(parent);
};
}
KCModule *create_proxy(QWidget *parent, const char /**name*/)
{
return new KProxyOptions(parent);
};
}
KCModule *create_cache(QWidget *parent, const char /**name*/)
{
return new KCacheConfigDialog( parent );
};
}
KCModule *create_netpref(QWidget *parent, const char /**name*/)
{
return new KIOPreferences(parent);
};
}
KCModule *create_lanbrowser(QWidget *parent, const char *)
{
......
......@@ -259,7 +259,7 @@ void KBehaviourOptions::updateWinPixmap(bool b)
QString KBehaviourOptions::quickHelp() const
{
return i18n("<h1>Konqueror Behavior</h1> You can configure how Konqueror behaves as a file manager here.");
};
}
void KBehaviourOptions::changed()
......
......@@ -43,7 +43,7 @@ extern "C"
KCModule *create_virtualdesktops(QWidget *parent, const char * /*name*/)
{
return new KDesktopConfig(parent, "kcmkonq");
};
}
}
// I'm using lineedits by intention as it makes sence to be able
......
......@@ -363,6 +363,6 @@ void KonqFontOptions::slotTextBackgroundColorChanged( const QColor &col )
QString KonqFontOptions::quickHelp() const
{
return i18n("<h1>Appearance</h1> You can configure how Konqueror looks as a file manager here.");
};
}
#include "fontopts.moc"
......@@ -57,25 +57,25 @@ KShellCommandDialog::KShellCommandDialog(const QString& title, const QString& co
connect(cancelButton, SIGNAL(clicked()), m_shell, SLOT(slotFinished()));
connect(m_shell, SIGNAL(finished()), this, SLOT(disableStopButton()));
connect(closeButton,SIGNAL(clicked()), this, SLOT(slotClose()));
};
}
KShellCommandDialog::~KShellCommandDialog()
{
delete m_shell;
m_shell=0;
};
}
void KShellCommandDialog::disableStopButton()
{
cancelButton->setEnabled(false);
};
}
void KShellCommandDialog::slotClose()
{
delete m_shell;
m_shell=0;
accept();
};
}
//blocking
int KShellCommandDialog::executeCommand()
......@@ -85,6 +85,6 @@ int KShellCommandDialog::executeCommand()
//kdDebug()<<"---------- KShellCommandDialog::executeCommand()"<<endl;
m_shell->exec();
return exec();
};
}
#include "kshellcmddialog.moc"
......@@ -39,7 +39,7 @@ KShellCommandExecutor::KShellCommandExecutor(const QString& command, QWidget* pa
{
setTextFormat(PlainText);
setFont( KGlobalSettings::fixedFont() );
};
}
KShellCommandExecutor::~KShellCommandExecutor()
{
......@@ -48,7 +48,7 @@ KShellCommandExecutor::~KShellCommandExecutor()
::kill(m_shellProcess->pid()+1, SIGTERM);
delete m_shellProcess;
};
};
}
int KShellCommandExecutor::exec()
{
......@@ -86,7 +86,7 @@ int KShellCommandExecutor::exec()
connect (m_writeNotifier, SIGNAL(activated(int)), this,SLOT(writeDataToShell()));
return 1;
};
}
void KShellCommandExecutor::readDataFromShell()
{
......@@ -106,7 +106,7 @@ void KShellCommandExecutor::readDataFromShell()
this->append(QString(buffer));
setTextFormat(PlainText);
};
};
}
void KShellCommandExecutor::writeDataToShell()
{
......@@ -123,7 +123,7 @@ void KShellCommandExecutor::writeDataToShell()
else
slotFinished();
m_writeNotifier->setEnabled(false);
};
}
void KShellCommandExecutor::slotFinished()
{
......@@ -141,6 +141,6 @@ void KShellCommandExecutor::slotFinished()
delete m_shellProcess;
m_shellProcess=0;
emit finished();
};
}
#include "kshellcmdexecutor.moc"
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