summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2014-05-18 09:29:04 (GMT)
committerRemko Tronçon <git@el-tramo.be>2014-05-18 15:49:08 (GMT)
commit9bba31c6ce54290011a96723f720d872ecdbabca (patch)
treeeec68d77764e85957d4c25878010e34f29ee8410 /Swift/QtUI/QtPlainChatView.h
parenta507d029d8995e27adf96a46f60a8ba696667f7e (diff)
downloadswift-contrib-9bba31c6ce54290011a96723f720d872ecdbabca.zip
swift-contrib-9bba31c6ce54290011a96723f720d872ecdbabca.tar.bz2
Fix uninitialized variables
Change-Id: I95b6b67dcafe338561d3dfb28664bc3bba6d1159
Diffstat (limited to 'Swift/QtUI/QtPlainChatView.h')
-rw-r--r--Swift/QtUI/QtPlainChatView.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/Swift/QtUI/QtPlainChatView.h b/Swift/QtUI/QtPlainChatView.h
index 01b5925..cf65fb3 100644
--- a/Swift/QtUI/QtPlainChatView.h
+++ b/Swift/QtUI/QtPlainChatView.h
@@ -92,42 +92,41 @@ namespace Swift {
PopupDialog *parent_;
JID jid_;
std::string senderName_;
std::string password_;
bool isImpromptu_;
bool isContinuation_;
};
struct FileTransfer : public PopupDialog {
struct Action : QPushButton {
Action(const std::string& text, const std::string& id)
: QPushButton(P2QSTRING(text)), id_(id) {}
std::string id_;
};
FileTransfer(QtPlainChatView* parent, bool senderIsSelf, const std::string& ftId, const std::string& filename, const ChatWindow::FileTransferState state, const std::string& desc, const std::string& msg, bool initializing);
QProgressBar* bar_;
bool senderIsSelf_;
std::string ftId_;
std::string filename_;
std::string description_;
std::string message_;
bool initializing_;
};
class LogTextEdit : public QTextEdit {
public:
LogTextEdit(QWidget* parent) : QTextEdit(parent) {}
virtual ~LogTextEdit() {}
virtual void contextMenuEvent(QContextMenuEvent *event);
};
typedef std::map<std::string, FileTransfer*> FileTransferMap;
QtChatWindow* window_;
UIEventStream* eventStream_;
LogTextEdit* log_;
- QMenu* logMenu_;
FileTransferMap fileTransfers_;
std::map<std::string, boost::shared_ptr<SecurityLabel> > lastMessageLabel_;
int idGenerator_;
};
}