Port isf-qt to giflib 5 and clean build warnings
This commit is contained in:
+6
-11
@@ -455,8 +455,7 @@ void ChatWindow::closeWidgetOrTab()
|
||||
// Create the menus.
|
||||
void ChatWindow::createMenus()
|
||||
{
|
||||
QAction *closeAction, *saveAction, *quitAction;
|
||||
QAction *copy, *findAction, *zoomIn, *zoomOut, *clearChatAction;
|
||||
QAction *closeAction, *saveAction, *clearChatAction;
|
||||
QAction *contactsDockAction, *standardEmoticonsDockAction, *customEmoticonsDockAction;
|
||||
|
||||
|
||||
@@ -468,21 +467,21 @@ void ChatWindow::createMenus()
|
||||
saveAction = new QAction ( QIcon::fromTheme( "document-save" ), i18n("Save Chat..."), this );
|
||||
closeAllAction_ = new QAction ( QIcon::fromTheme( "dialog-close" ), i18n("Close &All Tabs"), this );
|
||||
closeAction = KStandardAction::close ( this, SLOT( closeWidgetOrTab() ) , actionCollection_ );
|
||||
quitAction = KStandardAction::quit ( QApplication::instance(), SLOT( quit() ), actionCollection_ );
|
||||
KStandardAction::quit ( QApplication::instance(), SLOT( quit() ), actionCollection_ );
|
||||
|
||||
// Create the actions for "Edit" menu
|
||||
changeFontAction_ = new QAction ( QIcon::fromTheme( "preferences-desktop-font" ), i18n("Change &Font"), this );
|
||||
changeFontColorAction_ = new QAction ( QIcon::fromTheme( "format-stroke-color" ), i18n("Change Font &Color"), this );
|
||||
cutAction_ = KStandardAction::cut ( messageEdit_, SLOT( cut() ), actionCollection_ );
|
||||
copy = KStandardAction::copy ( messageEdit_, SLOT( copy() ), actionCollection_ );
|
||||
KStandardAction::copy ( messageEdit_, SLOT( copy() ), actionCollection_ );
|
||||
pasteAction_ = KStandardAction::paste ( messageEdit_, SLOT( paste() ), actionCollection_ );
|
||||
findAction = KStandardAction::find ( this, SLOT( editFind() ), actionCollection_ );
|
||||
KStandardAction::find ( this, SLOT( editFind() ), actionCollection_ );
|
||||
|
||||
// Create the actions for "View" menu
|
||||
emoticonAction_ = new KToggleAction( QIcon::fromTheme( "face-smile-big" ), i18n("Show &Emoticons"), this );
|
||||
sessionInfoAction_ = new KToggleAction( QIcon::fromTheme( "flag-green" ), i18n("Show S&tatus Messages"), this );
|
||||
zoomIn = KStandardAction::zoomIn ( this, SLOT( viewZoomIn() ), actionCollection_ );
|
||||
zoomOut = KStandardAction::zoomOut( this, SLOT( viewZoomOut() ), actionCollection_ );
|
||||
KStandardAction::zoomIn ( this, SLOT( viewZoomIn() ), actionCollection_ );
|
||||
KStandardAction::zoomOut( this, SLOT( viewZoomOut() ), actionCollection_ );
|
||||
prevTabAction_ = KStandardAction::back ( this, SLOT( slotSwitchToLeftTab() ), actionCollection_ );
|
||||
nextTabAction_ = KStandardAction::forward( this, SLOT( slotSwitchToRightTab() ), actionCollection_ );
|
||||
clearChatAction = KStandardAction::clear ( this, SLOT( viewClearChat() ), actionCollection_ );
|
||||
@@ -2998,7 +2997,3 @@ void ChatWindow::viewZoomOut()
|
||||
{
|
||||
changeZoomFactor( false );
|
||||
}
|
||||
|
||||
|
||||
|
||||
#include "chatwindow.moc"
|
||||
|
||||
Reference in New Issue
Block a user