← Back to branch summary

~ubuntu-branches/ubuntu/karmic/qtcreator/karmic-security

« back to all changes in this revision

Viewing changes to src/plugins/perforce/perforceplugin.h

  • Committer: Bazaar Package Importer
  • Author(s): Andres Rodriguez
  • Date: 2009-07-19 16:23:52 UTC
  • mfrom: (3.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20090719162352-oni0h8hrrkdd3sil
Tags: 1.2.1-1ubuntu1
https://launchpad.net/bugs/399414
* Merge from debian unstable (LP: #399414), remaining changes:
  - Add qt-creator transitional package.
* debian/control: Conflicts on qt-creator (<< 1.2.1-1ubuntu1).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/perforce/perforceplugin.h
4
4
**
5
5
** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
6
6
**
7
 
** Contact:  Qt Software Information (qt-info@nokia.com)
 
7
** Contact: Nokia Corporation (qt-info@nokia.com)
8
8
**
9
9
** Commercial Usage
10
10
**
23
23
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
24
24
**
25
25
** If you are unsure which license is appropriate for your use, please
26
 
** contact the sales department at qt-sales@nokia.com.
 
26
** contact the sales department at http://www.qtsoftware.com/contact.
27
27
**
28
28
**************************************************************************/
29
29
 
51
51
 
52
52
namespace Core {
53
53
    class IEditorFactory;
 
54
    namespace Utils {
 
55
        class ParameterAction;
 
56
    }
54
57
}
55
58
 
56
59
namespace Perforce {
109
112
    static PerforcePlugin *perforcePluginInstance();
110
113
 
111
114
    const PerforceSettings& settings() const;
112
 
    void setSettings(const QString &p4Command, const QString &p4Port, const QString &p4Client, const QString p4User, bool defaultEnv);
 
115
    void setSettings(const Settings &s);
113
116
 
114
117
    // Map a perforce name "//xx" to its real name in the file system
115
118
    QString fileNameFromPerforceName(const QString& perforceName, QString *errorMessage) const;
138
141
    void printPendingChanges();
139
142
    void slotDiff(const QStringList &files);
140
143
 
141
 
#ifdef USE_P4_API
142
 
    void resolve();
143
 
#endif
144
 
 
145
144
private:
146
145
    QStringList environment() const;
147
146
 
163
162
 
164
163
    QString clientFilePath(const QString &serverFilePath);
165
164
    QString currentFileName();
166
 
    bool checkP4Command() const;
 
165
    bool checkP4Configuration(QString *errorMessage = 0) const;
167
166
    void showOutput(const QString &output, bool popup = false) const;
168
167
    void annotate(const QString &fileName);
169
168
    void filelog(const QString &fileName);
174
173
    SettingsPage *m_settingsPage;
175
174
    QList<Core::IEditorFactory*> m_editorFactories;
176
175
 
177
 
    QAction *m_editAction;
178
 
    QAction *m_addAction;
179
 
    QAction *m_deleteAction;
 
176
    Core::Utils::ParameterAction *m_editAction;
 
177
    Core::Utils::ParameterAction *m_addAction;
 
178
    Core::Utils::ParameterAction *m_deleteAction;
180
179
    QAction *m_openedAction;
181
 
    QAction *m_revertAction;
182
 
    QAction *m_diffCurrentAction;
183
 
    QAction *m_diffProjectAction;
 
180
    Core::Utils::ParameterAction *m_revertAction;
 
181
    Core::Utils::ParameterAction *m_diffCurrentAction;
 
182
    Core::Utils::ParameterAction *m_diffProjectAction;
184
183
    QAction *m_diffAllAction;
185
184
    QAction *m_resolveAction;
186
185
    QAction *m_submitAction;
187
186
    QAction *m_pendingAction;
188
187
    QAction *m_describeAction;
189
 
    QAction *m_annotateCurrentAction;
 
188
    Core::Utils::ParameterAction *m_annotateCurrentAction;
190
189
    QAction *m_annotateAction;
191
 
    QAction *m_filelogCurrentAction;
 
190
    Core::Utils::ParameterAction *m_filelogCurrentAction;
192
191
    QAction *m_filelogAction;
193
192
    QAction *m_submitCurrentLogAction;
194
193
    bool m_submitActionTriggered;
223
222
    static PerforcePlugin *m_perforcePluginInstance;
224
223
    QString pendingChangesData();
225
224
 
226
 
#ifdef USE_P4_API
227
 
    void runP4APICmd(const QString &cmd, const QStringList &args = QStringList());
228
 
    WorkbenchClientUser *m_workbenchClientUser;
229
 
    bool m_enableP4APIActions;
230
 
#endif
231
 
 
232
225
    CoreListener *m_coreListener;
233
226
    Core::IEditorFactory *m_submitEditorFactory;
234
227
    PerforceVersionControl *m_versionControl;