Skip to content

Commit

Permalink
Reverted changes for #102 back to revision e15348a.
Browse files Browse the repository at this point in the history
Revert "Converted ShellAnything classes to use String class instead of std::string. For #102."
This reverts commit e381d08.

Revert "Updated String class."
This reverts commit 2792c81.

Revert "Created a String class to replace std::string. For #102."
This reverts commit 88722ad.

Revert "Removed unrequired includes for vector."
This reverts commit af0dd4d.

Revert "Renamed MenuPtrList2 to MenuPtrList."
This reverts commit 4d1a67c.

Revert "Modified Action.h and created ActionPtrList based on ListsDeclaration.inc and ListsBody.inc."
This reverts commit 7904429.

Revert "Deleted Node class. For issue #102."
This reverts commit 9b6d925.

Revert "Fixed memory leaks based on Node removal. For issue #102."
This reverts commit 3960a4c.

Revert "Modified Menu class to not use the Node class."
This reverts commit 60df745.

Revert "Modified Configuration class to not use the Node class."
This reverts commit 934d061.

Revert "Modified ConfigManager to always return a copy of the internal Configurations."
This reverts commit 01fc6fb.

Revert "Created ListsDeclaration.inc and ListsBody.inc to create list of objects (or base types) without exposing std::vector or std::list."
This reverts commit deccf01.
  • Loading branch information
end2endzone committed Jan 1, 2022
1 parent e381d08 commit 0220f17
Show file tree
Hide file tree
Showing 62 changed files with 1,409 additions and 1,653 deletions.
16 changes: 7 additions & 9 deletions include/shellanything/Action.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
#ifndef SA_ACTION_H
#define SA_ACTION_H

#include "shellanything/Node.h"
#include "shellanything/Context.h"
#include <vector>

namespace shellanything
{
Expand All @@ -36,6 +38,11 @@ namespace shellanything
class Action
{
public:
/// <summary>
/// A list of Action class pointers.
/// </summary>
typedef std::vector<Action*> ActionPtrList;

Action();
virtual ~Action();

Expand All @@ -56,13 +63,4 @@ namespace shellanything

} //namespace shellanything

/// <summary>
/// A list of Action pointer.
/// </summary>
#define SA_LISTS_CLASS_NAME ActionPtrList
#define SA_LISTS_BASE_TYPE Action *
#include "shellanything/ListsDeclaration.inc"
#undef SA_LISTS_BASE_TYPE
#undef SA_LISTS_CLASS_NAME

#endif //SA_ACTION_H
6 changes: 3 additions & 3 deletions include/shellanything/ActionClipboard.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ namespace shellanything
/// <summary>
/// Getter for the 'value' parameter.
/// </summary>
const String & GetValue() const;
const std::string & GetValue() const;

/// <summary>
/// Setter for the 'value' parameter.
/// </summary>
void SetValue(const String & value);
void SetValue(const std::string & value);

private:
String mValue;
std::string mValue;
};

} //namespace shellanything
Expand Down
24 changes: 12 additions & 12 deletions include/shellanything/ActionExecute.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,42 +49,42 @@ namespace shellanything
/// <summary>
/// Getter for the 'path' parameter.
/// </summary>
const String & GetPath() const;
const std::string & GetPath() const;

/// <summary>
/// Setter for the 'path' parameter.
/// </summary>
void SetPath(const String & path);
void SetPath(const std::string & path);

/// <summary>
/// Getter for the 'basedir' parameter.
/// </summary>
const String & GetBaseDir() const;
const std::string & GetBaseDir() const;

/// <summary>
/// Setter for the 'basedir' parameter.
/// </summary>
void SetBaseDir(const String & base_dir);
void SetBaseDir(const std::string & base_dir);

/// <summary>
/// Getter for the 'arguments' parameter.
/// </summary>
const String & GetArguments() const;
const std::string & GetArguments() const;

/// <summary>
/// Setter for the 'arguments' parameter.
/// </summary>
void SetArguments(const String & arguments);
void SetArguments(const std::string & arguments);

/// <summary>
/// Getter for the 'verb' parameter.
/// </summary>
const String& GetVerb() const;
const std::string& GetVerb() const;

/// <summary>
/// Setter for the 'verb' parameter.
/// </summary>
void SetVerb(const String& verb);
void SetVerb(const std::string& verb);

private:
/// <summary>
Expand All @@ -104,10 +104,10 @@ namespace shellanything
virtual bool ExecuteProcess(const Context & context) const;

private:
String mPath;
String mBaseDir;
String mArguments;
String mVerb;
std::string mPath;
std::string mBaseDir;
std::string mArguments;
std::string mVerb;
};

} //namespace shellanything
Expand Down
18 changes: 9 additions & 9 deletions include/shellanything/ActionFile.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,37 +49,37 @@ namespace shellanything
/// <summary>
/// Getter for the 'path' parameter.
/// </summary>
const String & GetPath() const;
const std::string & GetPath() const;

/// <summary>
/// Setter for the 'path' parameter.
/// </summary>
void SetPath(const String & path);
void SetPath(const std::string & path);

/// <summary>
/// Getter for the 'content' parameter.
/// </summary>
const String & GetText() const;
const std::string & GetText() const;

/// <summary>
/// Setter for the 'content' parameter.
/// </summary>
void SetText(const String & text);
void SetText(const std::string & text);

/// <summary>
/// Getter for the 'encoding' parameter.
/// </summary>
const String & GetEncoding() const;
const std::string & GetEncoding() const;

/// <summary>
/// Setter for the 'encoding' parameter.
/// </summary>
void SetEncoding(const String & encoding);
void SetEncoding(const std::string & encoding);

private:
String mPath;
String mText;
String mEncoding;
std::string mPath;
std::string mText;
std::string mEncoding;
};

} //namespace shellanything
Expand Down
18 changes: 9 additions & 9 deletions include/shellanything/ActionMessage.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,37 +49,37 @@ namespace shellanything
/// <summary>
/// Getter for the 'title' parameter.
/// </summary>
const String & GetTitle() const;
const std::string & GetTitle() const;

/// <summary>
/// Setter for the 'title' parameter.
/// </summary>
void SetTitle(const String & title);
void SetTitle(const std::string & title);

/// <summary>
/// Getter for the 'caption' parameter.
/// </summary>
const String & GetCaption() const;
const std::string & GetCaption() const;

/// <summary>
/// Setter for the 'caption' parameter.
/// </summary>
void SetCaption(const String & caption);
void SetCaption(const std::string & caption);

/// <summary>
/// Getter for the 'icon' parameter.
/// </summary>
const String & GetIcon() const;
const std::string & GetIcon() const;

/// <summary>
/// Setter for the 'icon' parameter.
/// </summary>
void SetIcon(const String & icon);
void SetIcon(const std::string & icon);

private:
String mTitle;
String mCaption;
String mIcon;
std::string mTitle;
std::string mCaption;
std::string mIcon;
};

} //namespace shellanything
Expand Down
6 changes: 3 additions & 3 deletions include/shellanything/ActionOpen.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ namespace shellanything
/// <summary>
/// Getter for the 'path' parameter.
/// </summary>
const String & GetPath() const;
const std::string & GetPath() const;

/// <summary>
/// Setter for the 'path' parameter.
/// </summary>
void SetPath(const String & path);
void SetPath(const std::string & path);

private:
String mPath;
std::string mPath;
};

} //namespace shellanything
Expand Down
36 changes: 18 additions & 18 deletions include/shellanything/ActionPrompt.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,70 +61,70 @@ namespace shellanything
/// <summary>
/// Getter for the 'name' parameter.
/// </summary>
const String & GetName() const;
const std::string & GetName() const;

/// <summary>
/// Setter for the 'name' parameter.
/// </summary>
void SetName(const String & name);
void SetName(const std::string & name);

/// <summary>
/// Getter for the 'type' parameter.
/// </summary>
const String & GetType() const;
const std::string & GetType() const;

/// <summary>
/// Setter for the 'type' parameter.
/// </summary>
void SetType(const String & type);
void SetType(const std::string & type);

/// <summary>
/// Getter for the 'title' parameter.
/// </summary>
const String & GetTitle() const;
const std::string & GetTitle() const;

/// <summary>
/// Setter for the 'title' parameter.
/// </summary>
void SetTitle(const String & title);
void SetTitle(const std::string & title);

/// <summary>
/// Getter for the 'default' parameter.
/// </summary>
const String & GetDefault() const;
const std::string & GetDefault() const;

/// <summary>
/// Setter for the 'default' parameter.
/// </summary>
void SetDefault(const String & default_value);
void SetDefault(const std::string & default_value);

/// <summary>
/// Getter for the 'valueyes' parameter.
/// </summary>
const String & GetValueYes() const;
const std::string & GetValueYes() const;

/// <summary>
/// Setter for the 'valueyes' parameter.
/// </summary>
void SetValueYes(const String & value_yes);
void SetValueYes(const std::string & value_yes);

/// <summary>
/// Getter for the 'valueno' parameter.
/// </summary>
const String & GetValueNo() const;
const std::string & GetValueNo() const;

/// <summary>
/// Setter for the 'valueno' parameter.
/// </summary>
void SetValueNo(const String & value_no);
void SetValueNo(const std::string & value_no);

private:
String mType;
String mName;
String mTitle;
String mDefault;
String mValueYes;
String mValueNo;
std::string mType;
std::string mName;
std::string mTitle;
std::string mDefault;
std::string mValueYes;
std::string mValueNo;
};

} //namespace shellanything
Expand Down
18 changes: 9 additions & 9 deletions include/shellanything/ActionProperty.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,37 +49,37 @@ namespace shellanything
/// <summary>
/// Getter for the 'name' parameter.
/// </summary>
const String & GetName() const;
const std::string & GetName() const;

/// <summary>
/// Setter for the 'name' parameter.
/// </summary>
void SetName(const String & name);
void SetName(const std::string & name);

/// <summary>
/// Getter for the 'value' parameter.
/// </summary>
const String & GetValue() const;
const std::string & GetValue() const;

/// <summary>
/// Setter for the 'value' parameter.
/// </summary>
void SetValue(const String & value);
void SetValue(const std::string & value);

/// <summary>
/// Getter for the 'exprtk' parameter.
/// </summary>
const String & GetExprtk() const;
const std::string & GetExprtk() const;

/// <summary>
/// Setter for the 'exprtk' parameter.
/// </summary>
void SetExprtk(const String & exprtk);
void SetExprtk(const std::string & exprtk);

private:
String mName;
String mValue;
String mExprtk;
std::string mName;
std::string mValue;
std::string mExprtk;
};


Expand Down
Loading

0 comments on commit 0220f17

Please sign in to comment.