Bladeren bron

Use Qt naming convention for getters.

Sascha Zelzer 11 jaren geleden
bovenliggende
commit
9cf4970509

+ 1 - 1
Applications/ctkXnatTreeBrowser/ctkXnatTreeBrowserMainWindow.cpp

@@ -74,7 +74,7 @@ void ctkXnatTreeBrowserMainWindow::loginButtonPushed()
     ctkXnatLoginDialog loginDialog(m_SessionFactory);
     if (loginDialog.exec() == QDialog::Accepted)
     {
-      m_Session = loginDialog.getSession();
+      m_Session = loginDialog.session();
       if (m_Session)
       {
         ui->loginButton->setText("Logout");

+ 3 - 10
Libs/XNAT/Core/ctkXnatSettings.cpp

@@ -25,19 +25,12 @@
 #include <QFileInfo>
 #include <QUuid>
 
-ctkXnatSettings::ctkXnatSettings()
-{
-}
-
-ctkXnatSettings::~ctkXnatSettings()
-{
-}
-
-QString ctkXnatSettings::getWorkSubdirectory() const
+//----------------------------------------------------------------------------
+QString ctkXnatSettings::workSubdirectory() const
 {
   // set work directory name
   QDir workDir;
-  QString workDirName = getDefaultWorkDirectory();
+  QString workDirName = defaultWorkDirectory();
   if ( !workDirName.isEmpty() )
   {
     workDir = QDir(workDirName);

+ 6 - 9
Libs/XNAT/Core/ctkXnatSettings.h

@@ -32,27 +32,24 @@ class ctkXnatLoginProfile;
 class CTK_XNAT_CORE_EXPORT ctkXnatSettings
 {
 public:
-  virtual QString getDefaultDirectory() const = 0;
+  virtual QString defaultDirectory() const = 0;
   virtual void setDefaultDirectory(const QString& dir) = 0;
 
-  virtual QString getDefaultWorkDirectory() const = 0;
+  virtual QString defaultWorkDirectory() const = 0;
   virtual void setDefaultWorkDirectory(const QString& workDir) = 0;
 
-  virtual QString getWorkSubdirectory() const;
+  virtual QString workSubdirectory() const;
 
-  virtual QMap<QString, ctkXnatLoginProfile*> getLoginProfiles() const = 0;
+  virtual QMap<QString, ctkXnatLoginProfile*> loginProfiles() const = 0;
   virtual void setLoginProfiles(QMap<QString, ctkXnatLoginProfile*> loginProfiles) = 0;
 
-  virtual ctkXnatLoginProfile* getLoginProfile(QString profileName) const = 0;
+  virtual ctkXnatLoginProfile* loginProfile(QString profileName) const = 0;
   virtual void setLoginProfile(QString profileName, ctkXnatLoginProfile*) = 0;
 
   virtual void removeLoginProfile(QString profileName) = 0;
 
-  virtual ctkXnatLoginProfile* getDefaultLoginProfile() const = 0;
+  virtual ctkXnatLoginProfile* defaultLoginProfile() const = 0;
 
-protected:
-  explicit ctkXnatSettings();
-  virtual ~ctkXnatSettings();
 };
 
 #endif

+ 4 - 4
Libs/XNAT/Widgets/ctkXnatLoginDialog.cpp

@@ -126,13 +126,13 @@ void ctkXnatLoginDialog::setSettings(ctkXnatSettings* settings)
   {
     return;
   }
-  d->Profiles = d->Settings->getLoginProfiles();
+  d->Profiles = d->Settings->loginProfiles();
 
   d->ProfileNames = d->Profiles.keys();
   d->ProfileNames.sort();
   d->Model.setStringList(d->ProfileNames);
 
-  ctkXnatLoginProfile* defaultProfile = d->Settings->getDefaultLoginProfile();
+  ctkXnatLoginProfile* defaultProfile = d->Settings->defaultLoginProfile();
 
   if (defaultProfile)
     {
@@ -146,9 +146,9 @@ void ctkXnatLoginDialog::setSettings(ctkXnatSettings* settings)
     }
 }
 
-ctkXnatSession* ctkXnatLoginDialog::getSession()
+ctkXnatSession* ctkXnatLoginDialog::session() const
 {
-  Q_D(ctkXnatLoginDialog);
+  Q_D(const ctkXnatLoginDialog);
   return d->Session;
 }
 

+ 1 - 1
Libs/XNAT/Widgets/ctkXnatLoginDialog.h

@@ -46,7 +46,7 @@ public:
   ctkXnatSettings* settings() const;
   void setSettings(ctkXnatSettings* settings);
 
-  ctkXnatSession* getSession();
+  ctkXnatSession* session() const;
 
   virtual void accept();