← Back to branch summary

~ubuntu-branches/ubuntu/quantal/kdegames/quantal

« back to all changes in this revision

Viewing changes to kfourinline/src/kwin4.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2011-12-15 14:17:50 UTC
  • mfrom: (1.3.14)
  • Revision ID: package-import@ubuntu.com-20111215141750-6tj6brf4azhrt915
Tags: 4:4.7.90-0ubuntu1
new upstream beta release

Show diffs side-by-side

added added

removed removed

Lines of Context:
kfourinline/src/kwin4.cpp
329
329
  
330
330
  action = actionCollection()->addAction( QLatin1String( "network_conf" ));
331
331
  action->setText(i18n("&Network Configuration..."));
332
 
  connect(action, SIGNAL(triggered(bool) ), SLOT(configureNetwork()));
 
332
  connect(action, SIGNAL(triggered(bool)), SLOT(configureNetwork()));
333
333
 
334
334
  action = actionCollection()->addAction( QLatin1String( "network_chat" ));
335
335
  action->setText(i18n("Network Chat..."));
336
 
  connect(action, SIGNAL(triggered(bool) ), SLOT(configureChat()));
 
336
  connect(action, SIGNAL(triggered(bool)), SLOT(configureChat()));
337
337
 
338
338
  action = actionCollection()->addAction( QLatin1String( "statistics" ));
339
339
  action->setIcon(KIcon( QLatin1String( "view-statistics" )));
363
363
  {
364
364
    action = actionCollection()->addAction( QLatin1String( "file_debug" ));
365
365
    action->setText(i18n("Debug KGame"));
366
 
    connect(action, SIGNAL(triggered(bool) ), SLOT(debugKGame()));
 
366
    connect(action, SIGNAL(triggered(bool)), SLOT(debugKGame()));
367
367
  }
368
368
}
369
369
 
397
397
void KWin4App::connectDocument()
398
398
{
399
399
  // KGame signals
400
 
  connect(mDoc,SIGNAL(signalGameOver(int, KPlayer*,KGame*)),
401
 
         this,SLOT(slotGameOver(int, KPlayer*,KGame *)));
 
400
  connect(mDoc,SIGNAL(signalGameOver(int,KPlayer*,KGame*)),
 
401
         this,SLOT(slotGameOver(int,KPlayer*,KGame*)));
402
402
  connect(mDoc,SIGNAL(signalNextPlayer(int)),
403
403
         this,SLOT(moveDone(int)));
404
 
  connect(mDoc,SIGNAL(signalClientLeftGame(int, int,KGame*)),
405
 
         this,SLOT(networkBroken(int, int, KGame*)));
 
404
  connect(mDoc,SIGNAL(signalClientLeftGame(int,int,KGame*)),
 
405
         this,SLOT(networkBroken(int,int,KGame*)));
406
406
  connect(mDoc,SIGNAL(signalGameRun()),
407
407
         this,SLOT(gameRun()));
408
408
}
851
851
      mMyChatDlg->setPlayer(mDoc->getPlayer(Yellow));
852
852
    else
853
853
      mMyChatDlg->setPlayer(mDoc->getPlayer(Red));
854
 
    connect(mDoc,SIGNAL(signalChatChanged(KWin4Player *)),
855
 
            mMyChatDlg,SLOT(setPlayer(KWin4Player *)));
 
854
    connect(mDoc,SIGNAL(signalChatChanged(KWin4Player*)),
 
855
            mMyChatDlg,SLOT(setPlayer(KWin4Player*)));
856
856
  }
857
857
 
858
858
  if (mMyChatDlg->isHidden())
900
900
  QWidget* frame = new QWidget(dialog);
901
901
  ui.setupUi(frame);
902
902
  dialog->addPage(frame, i18n("General"), "games-config-options");
903
 
  connect(dialog, SIGNAL(settingsChanged(const QString &)), mDoc, SLOT(loadSettings()));
 
903
  connect(dialog, SIGNAL(settingsChanged(QString)), mDoc, SLOT(loadSettings()));
904
904
  dialog->show();
905
905
}
906
906